diff --git a/Cargo.lock b/Cargo.lock
index 12e15eeb80a..93f914712c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1032,6 +1032,8 @@ dependencies = [
  "criterion",
  "libc",
  "num-bigint",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
diff --git a/dsl/std/float.dag b/dsl/std/float.dag
index ccf34af53c9..b641b3b50ea 100644
--- a/dsl/std/float.dag
+++ b/dsl/std/float.dag
@@ -1,9 +1,9 @@
 // std/float.dag -- Floating-point types as algebraic compositions.
 //
-// Fixed-width floats are width refinements of a single approximate-float
-// algebra axis (`Ieee754Float`) composed with `MachineWidth<Word*>` (R3 §1.8
-// gate #19 `numeric_aliases_align_to_refinements`). IEEE 754 rounding still
-// breaks pure field laws — approximate semantics remain Grounding's concern.
+// Fixed-width floats are compatibility aliases for fixed-width reals:
+// `Float<N> = Real<N> = Compose<Real, MachineWidth<Word*>>` (R3 §1.8 gate #67
+// `numeric_construction_demonstration`). IEEE 754 rounding still breaks pure
+// field laws — approximate semantics remain Grounding's concern.
 //
 // T-Numeric-Construction / R3 gate #17 — abstract `Real` (construction-chain
 // layer 5). Spelling per
@@ -21,17 +21,24 @@ import std.integer { Int }
 import std.machine_constraints { Compose, MachineWidth }
 import v3.std.approximate_field { ApproximateField }
 
-// Opaque substrate carrier for the IEEE-754 approximate-float algebra axis
-// (width-independent at this layer; specialization via Compose).
+// Opaque compatibility carrier for older Float<N> receipts. The construction
+// chain authority below is `Real`; fixed-width public aliases route through
+// Real<N>-shaped Compose rows.
 type Ieee754Float
 
-type Float32 = Compose<Ieee754Float, MachineWidth<Word32>>
-type Float64 = Compose<Ieee754Float, MachineWidth<Word64>>
-
-// Default alias
-type Float = Float64
-
 // Abstract reals: approximate field over the exact rational **carrier**
 // `FieldOfFractions<Int>` (see `dsl/std/rational.dag` for `Rational =
 // Field<FieldOfFractions<Int>>`).
 type Real = ApproximateField<FieldOfFractions<Int>>
+
+// Fixed-width reals: abstract `Real` × machine width (refinement-shaped Compose).
+// These are the R3 gate #67 `numeric_construction_demonstration` Real<N>
+// construction entries; Rust Grounding maps Real64 to `f64`.
+type Real32 = Compose<Real, MachineWidth<Word32>>
+type Real64 = Compose<Real, MachineWidth<Word64>>
+
+type Float32 = Real32
+type Float64 = Real64
+
+// Default alias
+type Float = Float64
diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 7b565f9491f..36494583b78 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
         next_node_id: 597,
-        next_declaration_id: 2579,
+        next_declaration_id: 2581,
         next_port_id: 743,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_fixture_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2579,
+        declaration_append_begin_after_bootstrap: 2581,
     }
 }
 
@@ -375,14 +375,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(41),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(45),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10300, 10305),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(42),
-            target: TransformTarget::Callable(DeclarationId(829)),
+            target: TransformTarget::Callable(DeclarationId(831)),
             inputs: vec![PortId(45), PortId(44)],
             output: PortId(46),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10291, 10322),
@@ -398,21 +398,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(44),
-            target: TransformTarget::Callable(DeclarationId(1931)),
+            target: TransformTarget::Callable(DeclarationId(1933)),
             inputs: vec![PortId(47)],
             output: PortId(49),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(45),
-            target: TransformTarget::Callable(DeclarationId(1933)),
+            target: TransformTarget::Callable(DeclarationId(1935)),
             inputs: vec![PortId(49)],
             output: PortId(50),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(46),
-            target: TransformTarget::Callable(DeclarationId(1877)),
+            target: TransformTarget::Callable(DeclarationId(1879)),
             inputs: vec![PortId(47), PortId(48), PortId(50)],
             output: PortId(51),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -428,7 +428,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(48),
-            target: TransformTarget::Callable(DeclarationId(1879)),
+            target: TransformTarget::Callable(DeclarationId(1881)),
             inputs: vec![PortId(52), PortId(53), PortId(54)],
             output: PortId(55),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -444,21 +444,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(50),
-            target: TransformTarget::Callable(DeclarationId(1934)),
+            target: TransformTarget::Callable(DeclarationId(1936)),
             inputs: vec![PortId(56)],
             output: PortId(57),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(51),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(58),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11826, 11831),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(52),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(60),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11847, 11852),
@@ -520,7 +520,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(57),
-            target: TransformTarget::Callable(DeclarationId(836)),
+            target: TransformTarget::Callable(DeclarationId(838)),
             inputs: vec![PortId(65)],
             output: PortId(66),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11975, 12003),
@@ -589,21 +589,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(63),
-            target: TransformTarget::Callable(DeclarationId(833)),
+            target: TransformTarget::Callable(DeclarationId(835)),
             inputs: vec![PortId(71), PortId(72)],
             output: PortId(73),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12333, 12348),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(64),
-            target: TransformTarget::Callable(DeclarationId(1918)),
+            target: TransformTarget::Callable(DeclarationId(1920)),
             inputs: vec![PortId(73)],
             output: PortId(74),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(65),
-            target: TransformTarget::Callable(DeclarationId(849)),
+            target: TransformTarget::Callable(DeclarationId(851)),
             inputs: vec![PortId(74)],
             output: PortId(75),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12315, 12350),
@@ -619,21 +619,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(67),
-            target: TransformTarget::Callable(DeclarationId(833)),
+            target: TransformTarget::Callable(DeclarationId(835)),
             inputs: vec![PortId(76), PortId(77)],
             output: PortId(78),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12630, 12652),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(68),
-            target: TransformTarget::Callable(DeclarationId(1916)),
+            target: TransformTarget::Callable(DeclarationId(1918)),
             inputs: vec![PortId(78)],
             output: PortId(79),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(69),
-            target: TransformTarget::Callable(DeclarationId(849)),
+            target: TransformTarget::Callable(DeclarationId(851)),
             inputs: vec![PortId(79)],
             output: PortId(80),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12608, 12654),
@@ -649,14 +649,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(71),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(82), PortId(81)],
             output: PortId(83),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13598, 13623),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(72),
-            target: TransformTarget::Callable(DeclarationId(840)),
+            target: TransformTarget::Callable(DeclarationId(842)),
             inputs: vec![PortId(81), PortId(82)],
             output: PortId(84),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13654, 13681),
@@ -699,14 +699,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(75),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(86), PortId(87)],
             output: PortId(88),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13765, 13790),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(76),
-            target: TransformTarget::Callable(DeclarationId(837)),
+            target: TransformTarget::Callable(DeclarationId(839)),
             inputs: vec![PortId(86), PortId(87)],
             output: PortId(89),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13815, 13841),
@@ -756,14 +756,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(80),
-            target: TransformTarget::Callable(DeclarationId(1912)),
+            target: TransformTarget::Callable(DeclarationId(1914)),
             inputs: vec![PortId(92)],
             output: PortId(93),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(81),
-            target: TransformTarget::Callable(DeclarationId(1936)),
+            target: TransformTarget::Callable(DeclarationId(1938)),
             inputs: vec![PortId(91), PortId(93)],
             output: PortId(94),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -779,56 +779,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(83),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(98),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15204, 15208),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(84),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(101),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15275, 15279),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(85),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(103),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15306, 15311),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(86),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(105),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15337, 15342),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(87),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(107),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15372, 15377),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(88),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(109),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15404, 15409),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(89),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(111),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15432, 15437),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(90),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(113),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15460, 15465),
@@ -928,49 +928,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(92),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(117),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15539, 15543),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(93),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(119),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15566, 15570),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(94),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(115), PortId(120)],
             output: PortId(121),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15597, 15623),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(95),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(123),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15669, 15674),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(96),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(125),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15701, 15706),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(97),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(127),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15733, 15738),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(98),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(129),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15761, 15766),
@@ -1070,14 +1070,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(100),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(133),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15844, 15848),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(101),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(135),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15871, 15875),
@@ -1093,7 +1093,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(103),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(137), PortId(136)],
             output: PortId(138),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15912, 15942),
@@ -1118,7 +1118,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(106),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(140), PortId(141)],
             output: PortId(142),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15986, 16020),
@@ -1134,7 +1134,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(108),
-            target: TransformTarget::Callable(DeclarationId(836)),
+            target: TransformTarget::Callable(DeclarationId(838)),
             inputs: vec![PortId(143)],
             output: PortId(144),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16038, 16059),
@@ -1150,7 +1150,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(110),
-            target: TransformTarget::Callable(DeclarationId(836)),
+            target: TransformTarget::Callable(DeclarationId(838)),
             inputs: vec![PortId(145)],
             output: PortId(146),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16063, 16084),
@@ -1164,7 +1164,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(112),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(148),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16112, 16117),
@@ -1198,21 +1198,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(114),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(151),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16144, 16149),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(115),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(153),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16176, 16181),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(116),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(155),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16204, 16209),
@@ -1312,49 +1312,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(118),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(159),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16280, 16284),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(119),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(157), PortId(160)],
             output: PortId(161),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16308, 16334),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(120),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(163),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16360, 16365),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(121),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(165),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16395, 16400),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(122),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(167),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16427, 16432),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(123),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(169),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16455, 16460),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(124),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(171),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16487, 16492),
@@ -1454,56 +1454,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(126),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(173)],
             output: PortId(174),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16927, 16945),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(127),
-            target: TransformTarget::Callable(DeclarationId(830)),
+            target: TransformTarget::Callable(DeclarationId(832)),
             inputs: vec![PortId(96)],
             output: PortId(175),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16957, 16978),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(128),
-            target: TransformTarget::Callable(DeclarationId(1938)),
+            target: TransformTarget::Callable(DeclarationId(1940)),
             inputs: vec![PortId(174), PortId(175)],
             output: PortId(176),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(129),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(868)),
             inputs: vec![PortId(176)],
             output: PortId(177),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16893, 17029),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(130),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(178)],
             output: PortId(179),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17092, 17110),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(131),
-            target: TransformTarget::Callable(DeclarationId(830)),
+            target: TransformTarget::Callable(DeclarationId(832)),
             inputs: vec![PortId(96)],
             output: PortId(180),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17122, 17143),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(132),
-            target: TransformTarget::Callable(DeclarationId(1940)),
+            target: TransformTarget::Callable(DeclarationId(1942)),
             inputs: vec![PortId(179), PortId(180)],
             output: PortId(181),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(133),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(868)),
             inputs: vec![PortId(181)],
             output: PortId(182),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17058, 17194),
@@ -1612,7 +1612,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(136),
-            target: TransformTarget::Callable(DeclarationId(826)),
+            target: TransformTarget::Callable(DeclarationId(828)),
             inputs: vec![PortId(184), PortId(185)],
             output: PortId(186),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17268, 17290),
@@ -1628,63 +1628,63 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(138),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18426, 18430),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(139),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(190),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18495, 18500),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(140),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(191),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18529, 18533),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(141),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18564, 18568),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(142),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(194),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18595, 18599),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(143),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18629, 18633),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(144),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(196),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18657, 18661),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(145),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(197),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18682, 18686),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(146),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(198),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18712, 18716),
@@ -1784,14 +1784,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(149),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(202),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18804, 18809),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(150),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(203),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18838, 18843),
@@ -1807,14 +1807,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(152),
-            target: TransformTarget::Callable(DeclarationId(1171)),
+            target: TransformTarget::Callable(DeclarationId(1173)),
             inputs: vec![PortId(201)],
             output: PortId(206),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(153),
-            target: TransformTarget::Callable(DeclarationId(1171)),
+            target: TransformTarget::Callable(DeclarationId(1173)),
             inputs: vec![PortId(205)],
             output: PortId(207),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955),
@@ -1828,35 +1828,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(155),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(209),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18982, 18986),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(156),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(210),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19016, 19020),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(157),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(211),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19044, 19048),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(158),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19069, 19073),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(159),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(213),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19099, 19103),
@@ -1947,56 +1947,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(161),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(215),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19175, 19179),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(162),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(216),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19200, 19204),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(163),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19228, 19232),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(164),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(218),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19262, 19266),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(165),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(219),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19293, 19297),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(166),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(221),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19328, 19333),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(167),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(222),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19362, 19367),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(168),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(223),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19392, 19397),
@@ -2087,56 +2087,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(170),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(225),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19472, 19476),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(171),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(226),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19497, 19501),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(172),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(227),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19525, 19529),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(173),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(228),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19559, 19563),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(174),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(229),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19590, 19595),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(175),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19626, 19631),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(176),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19660, 19665),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(177),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(233),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19690, 19695),
@@ -2227,56 +2227,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(179),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(235),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19764, 19768),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(180),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(236),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19789, 19793),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(181),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(237),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19817, 19821),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(238),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19851, 19856),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(239),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19883, 19888),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(241),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19919, 19924),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(185),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(242),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19953, 19958),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(243),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19983, 19988),
@@ -2367,56 +2367,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(245),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20054, 20058),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(189),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(246),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20079, 20083),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(190),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(247),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20107, 20112),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(191),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(248),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20142, 20147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(192),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(249),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20174, 20179),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(193),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(251),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20210, 20215),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(194),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(252),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20244, 20249),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(195),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(253),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20274, 20279),
@@ -2507,56 +2507,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(197),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(255),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20350, 20354),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(198),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(256),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20375, 20380),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(199),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(257),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20404, 20409),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(200),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(258),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20439, 20444),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(201),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(259),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20471, 20476),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(261),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20507, 20512),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(203),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(262),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20541, 20546),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(204),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(263),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20571, 20576),
@@ -2740,7 +2740,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(208),
-            target: TransformTarget::Callable(DeclarationId(845)),
+            target: TransformTarget::Callable(DeclarationId(847)),
             inputs: vec![PortId(266), PortId(267)],
             output: PortId(268),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20681, 20707),
@@ -2783,7 +2783,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(211),
-            target: TransformTarget::Callable(DeclarationId(845)),
+            target: TransformTarget::Callable(DeclarationId(847)),
             inputs: vec![PortId(270), PortId(271)],
             output: PortId(272),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20814, 20840),
@@ -2826,49 +2826,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(214),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(275)],
             output: PortId(276),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22044, 22062),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(215),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(853)),
             inputs: vec![PortId(276)],
             output: PortId(277),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22025, 22063),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(216),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(859)),
             inputs: vec![PortId(277)],
             output: PortId(278),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22014, 22064),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(217),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(279)],
             output: PortId(280),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22168, 22186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(852)),
+            target: TransformTarget::Callable(DeclarationId(854)),
             inputs: vec![PortId(280)],
             output: PortId(281),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22136, 22187),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(856)),
             inputs: vec![PortId(281)],
             output: PortId(282),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22112, 22188),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(220),
-            target: TransformTarget::Callable(DeclarationId(859)),
+            target: TransformTarget::Callable(DeclarationId(861)),
             inputs: vec![PortId(282)],
             output: PortId(283),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22097, 22189),
@@ -2989,14 +2989,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(226),
-            target: TransformTarget::Callable(DeclarationId(1941)),
+            target: TransformTarget::Callable(DeclarationId(1943)),
             inputs: vec![PortId(287), PortId(288)],
             output: PortId(289),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(227),
-            target: TransformTarget::Callable(DeclarationId(1942)),
+            target: TransformTarget::Callable(DeclarationId(1944)),
             inputs: vec![PortId(286), PortId(289)],
             output: PortId(290),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -3012,7 +3012,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(229),
-            target: TransformTarget::Callable(DeclarationId(1943)),
+            target: TransformTarget::Callable(DeclarationId(1945)),
             inputs: vec![],
             output: PortId(292),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -3028,7 +3028,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(231),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(857)),
             inputs: vec![PortId(294)],
             output: PortId(295),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22641, 22671),
@@ -3044,7 +3044,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(233),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(853)),
             inputs: vec![PortId(296)],
             output: PortId(297),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22685, 22717),
@@ -3069,14 +3069,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(236),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(853)),
             inputs: vec![PortId(299)],
             output: PortId(300),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22756, 22788),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(237),
-            target: TransformTarget::Callable(DeclarationId(1944)),
+            target: TransformTarget::Callable(DeclarationId(1946)),
             inputs: vec![PortId(298), PortId(300)],
             output: PortId(301),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -3158,7 +3158,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(242),
-            target: TransformTarget::Callable(DeclarationId(853)),
+            target: TransformTarget::Callable(DeclarationId(855)),
             inputs: vec![PortId(305)],
             output: PortId(306),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23093, 23108),
@@ -3172,21 +3172,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(244),
-            target: TransformTarget::Callable(DeclarationId(1912)),
+            target: TransformTarget::Callable(DeclarationId(1914)),
             inputs: vec![PortId(307)],
             output: PortId(308),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(245),
-            target: TransformTarget::Callable(DeclarationId(1945)),
+            target: TransformTarget::Callable(DeclarationId(1947)),
             inputs: vec![],
             output: PortId(309),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(246),
-            target: TransformTarget::Callable(DeclarationId(1946)),
+            target: TransformTarget::Callable(DeclarationId(1948)),
             inputs: vec![PortId(308), PortId(309)],
             output: PortId(310),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -3229,7 +3229,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(249),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(313),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23245, 23250),
@@ -3245,7 +3245,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(251),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(857)),
             inputs: vec![PortId(315)],
             output: PortId(316),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23272, 23302),
@@ -3261,7 +3261,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(253),
-            target: TransformTarget::Callable(DeclarationId(853)),
+            target: TransformTarget::Callable(DeclarationId(855)),
             inputs: vec![PortId(317)],
             output: PortId(318),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23306, 23328),
@@ -3323,7 +3323,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(258),
-            target: TransformTarget::Callable(DeclarationId(1947)),
+            target: TransformTarget::Callable(DeclarationId(1949)),
             inputs: vec![],
             output: PortId(323),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -3339,7 +3339,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(260),
-            target: TransformTarget::Callable(DeclarationId(856)),
+            target: TransformTarget::Callable(DeclarationId(858)),
             inputs: vec![PortId(325)],
             output: PortId(326),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23635, 23664),
@@ -3355,7 +3355,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(262),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(856)),
             inputs: vec![PortId(327)],
             output: PortId(328),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23678, 23715),
@@ -3380,14 +3380,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(265),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(856)),
             inputs: vec![PortId(330)],
             output: PortId(331),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23754, 23791),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(1948)),
+            target: TransformTarget::Callable(DeclarationId(1950)),
             inputs: vec![PortId(329), PortId(331)],
             output: PortId(332),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -3483,42 +3483,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(273),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(341),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23908, 23913),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(274),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(343),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23939, 23944),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(275),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(345),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23967, 23972),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(276),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(347),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23991, 23996),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(277),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(349),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24015, 24020),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(278),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(351),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24043, 24048),
@@ -3641,42 +3641,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(283),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(358),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24163, 24168),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(284),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(360),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24194, 24199),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(285),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(362),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24222, 24227),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(286),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(364),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24246, 24251),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(287),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(366),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24270, 24275),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(288),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(368),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24298, 24303),
@@ -3792,7 +3792,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(292),
-            target: TransformTarget::Callable(DeclarationId(1912)),
+            target: TransformTarget::Callable(DeclarationId(1914)),
             inputs: vec![PortId(371)],
             output: PortId(372),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -3835,21 +3835,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(297),
-            target: TransformTarget::Callable(DeclarationId(1949)),
+            target: TransformTarget::Callable(DeclarationId(1951)),
             inputs: vec![PortId(377), PortId(378)],
             output: PortId(379),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(298),
-            target: TransformTarget::Callable(DeclarationId(869)),
+            target: TransformTarget::Callable(DeclarationId(871)),
             inputs: vec![PortId(379)],
             output: PortId(380),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25302, 25350),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(299),
-            target: TransformTarget::Callable(DeclarationId(858)),
+            target: TransformTarget::Callable(DeclarationId(860)),
             inputs: vec![PortId(380)],
             output: PortId(381),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25293, 25351),
@@ -3932,7 +3932,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(304),
-            target: TransformTarget::Callable(DeclarationId(1912)),
+            target: TransformTarget::Callable(DeclarationId(1914)),
             inputs: vec![PortId(385)],
             output: PortId(386),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -3984,14 +3984,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(310),
-            target: TransformTarget::Callable(DeclarationId(834)),
+            target: TransformTarget::Callable(DeclarationId(836)),
             inputs: vec![PortId(391), PortId(392), PortId(393)],
             output: PortId(394),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25577, 25627),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(311),
-            target: TransformTarget::Callable(DeclarationId(1918)),
+            target: TransformTarget::Callable(DeclarationId(1920)),
             inputs: vec![PortId(394)],
             output: PortId(395),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -4074,7 +4074,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(316),
-            target: TransformTarget::Callable(DeclarationId(1912)),
+            target: TransformTarget::Callable(DeclarationId(1914)),
             inputs: vec![PortId(399)],
             output: PortId(400),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -4126,7 +4126,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(322),
-            target: TransformTarget::Callable(DeclarationId(860)),
+            target: TransformTarget::Callable(DeclarationId(862)),
             inputs: vec![PortId(406), PortId(407)],
             output: PortId(408),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26086, 26135),
@@ -4160,14 +4160,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(326),
-            target: TransformTarget::Callable(DeclarationId(834)),
+            target: TransformTarget::Callable(DeclarationId(836)),
             inputs: vec![PortId(410), PortId(411), PortId(412)],
             output: PortId(413),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26171, 26221),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(327),
-            target: TransformTarget::Callable(DeclarationId(1916)),
+            target: TransformTarget::Callable(DeclarationId(1918)),
             inputs: vec![PortId(413)],
             output: PortId(414),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -4273,49 +4273,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(332),
-            target: TransformTarget::Callable(DeclarationId(861)),
+            target: TransformTarget::Callable(DeclarationId(863)),
             inputs: vec![PortId(420), PortId(418), PortId(419)],
             output: PortId(421),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26523, 26552),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(333),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(423),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26576, 26594),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(334),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(425),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26620, 26638),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(335),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26657, 26675),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(336),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(429),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26694, 26712),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(337),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(431),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26735, 26753),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(338),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(433),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26776, 26794),
@@ -4424,49 +4424,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(341),
-            target: TransformTarget::Callable(DeclarationId(862)),
+            target: TransformTarget::Callable(DeclarationId(864)),
             inputs: vec![PortId(435), PortId(438), PortId(436), PortId(437)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26927, 26963),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(342),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(441),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26987, 27005),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(343),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(443),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27031, 27049),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(344),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(445),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27068, 27086),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(345),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27105, 27123),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(346),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(449),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27146, 27164),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(347),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(451),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27187, 27205),
@@ -4575,21 +4575,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(350),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(453), PortId(454)],
             output: PortId(457),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27340, 27366),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(351),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(865)),
             inputs: vec![PortId(453)],
             output: PortId(458),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27376, 27397),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(352),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(455), PortId(456)],
             output: PortId(459),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27409, 27427),
@@ -4632,14 +4632,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(355),
-            target: TransformTarget::Callable(DeclarationId(833)),
+            target: TransformTarget::Callable(DeclarationId(835)),
             inputs: vec![PortId(461), PortId(462)],
             output: PortId(463),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27617, 27632),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(356),
-            target: TransformTarget::Callable(DeclarationId(1916)),
+            target: TransformTarget::Callable(DeclarationId(1918)),
             inputs: vec![PortId(463)],
             output: PortId(464),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -4673,7 +4673,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(360),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(466), PortId(468)],
             output: PortId(469),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27740, 27763),
@@ -4696,7 +4696,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(363),
-            target: TransformTarget::Callable(DeclarationId(829)),
+            target: TransformTarget::Callable(DeclarationId(831)),
             inputs: vec![PortId(470), PortId(471)],
             output: PortId(472),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27720, 27784),
@@ -4730,7 +4730,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(1950)),
+            target: TransformTarget::Callable(DeclarationId(1952)),
             inputs: vec![],
             output: PortId(477),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -4746,7 +4746,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(369),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(476), PortId(479)],
             output: PortId(480),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28026, 28057),
@@ -4762,7 +4762,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(371),
-            target: TransformTarget::Callable(DeclarationId(867)),
+            target: TransformTarget::Callable(DeclarationId(869)),
             inputs: vec![PortId(481), PortId(476)],
             output: PortId(482),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28071, 28116),
@@ -4787,14 +4787,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(374),
-            target: TransformTarget::Callable(DeclarationId(867)),
+            target: TransformTarget::Callable(DeclarationId(869)),
             inputs: vec![PortId(484), PortId(476)],
             output: PortId(485),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28155, 28200),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(1951)),
+            target: TransformTarget::Callable(DeclarationId(1953)),
             inputs: vec![PortId(483), PortId(485)],
             output: PortId(486),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -4876,35 +4876,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(380),
-            target: TransformTarget::Callable(DeclarationId(830)),
+            target: TransformTarget::Callable(DeclarationId(832)),
             inputs: vec![PortId(491)],
             output: PortId(492),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28329, 28353),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(381),
-            target: TransformTarget::Callable(DeclarationId(1953)),
+            target: TransformTarget::Callable(DeclarationId(1955)),
             inputs: vec![PortId(490), PortId(492)],
             output: PortId(493),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(868)),
             inputs: vec![PortId(493)],
             output: PortId(494),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28310, 28378),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(867)),
+            target: TransformTarget::Callable(DeclarationId(869)),
             inputs: vec![PortId(490), PortId(491)],
             output: PortId(495),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28414, 28448),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(1954)),
+            target: TransformTarget::Callable(DeclarationId(1956)),
             inputs: vec![PortId(491), PortId(495)],
             output: PortId(496),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -4947,14 +4947,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(387),
-            target: TransformTarget::Callable(DeclarationId(1955)),
+            target: TransformTarget::Callable(DeclarationId(1957)),
             inputs: vec![],
             output: PortId(499),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(388),
-            target: TransformTarget::Callable(DeclarationId(1957)),
+            target: TransformTarget::Callable(DeclarationId(1959)),
             inputs: vec![PortId(498), PortId(499)],
             output: PortId(500),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -4977,7 +4977,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(391),
-            target: TransformTarget::Callable(DeclarationId(1912)),
+            target: TransformTarget::Callable(DeclarationId(1914)),
             inputs: vec![PortId(502)],
             output: PortId(503),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -4993,7 +4993,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(393),
-            target: TransformTarget::Callable(DeclarationId(1057)),
+            target: TransformTarget::Callable(DeclarationId(1059)),
             inputs: vec![PortId(505)],
             output: PortId(506),
             span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172),
@@ -5009,7 +5009,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(395),
-            target: TransformTarget::Callable(DeclarationId(1058)),
+            target: TransformTarget::Callable(DeclarationId(1060)),
             inputs: vec![PortId(508)],
             output: PortId(509),
             span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238),
@@ -5025,7 +5025,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(397),
-            target: TransformTarget::Callable(DeclarationId(1060)),
+            target: TransformTarget::Callable(DeclarationId(1062)),
             inputs: vec![PortId(511)],
             output: PortId(512),
             span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307),
@@ -5050,7 +5050,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(400),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1922)),
             inputs: vec![PortId(515)],
             output: PortId(516),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -5064,7 +5064,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(402),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1922)),
             inputs: vec![PortId(517)],
             output: PortId(518),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1922)),
             inputs: vec![PortId(519)],
             output: PortId(520),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -5205,7 +5205,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(410),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1922)),
             inputs: vec![PortId(526)],
             output: PortId(527),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -5230,7 +5230,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(413),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1922)),
             inputs: vec![PortId(530)],
             output: PortId(531),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -5279,7 +5279,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(416),
-            target: TransformTarget::Callable(DeclarationId(1058)),
+            target: TransformTarget::Callable(DeclarationId(1060)),
             inputs: vec![PortId(533)],
             output: PortId(534),
             span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060),
@@ -5311,7 +5311,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(420),
-            target: TransformTarget::Callable(DeclarationId(2405)),
+            target: TransformTarget::Callable(DeclarationId(2407)),
             inputs: vec![],
             output: PortId(536),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297),
@@ -5327,28 +5327,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(422),
-            target: TransformTarget::Callable(DeclarationId(2405)),
+            target: TransformTarget::Callable(DeclarationId(2407)),
             inputs: vec![],
             output: PortId(540),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(423),
-            target: TransformTarget::Callable(DeclarationId(2405)),
+            target: TransformTarget::Callable(DeclarationId(2407)),
             inputs: vec![],
             output: PortId(541),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(424),
-            target: TransformTarget::Callable(DeclarationId(2407)),
+            target: TransformTarget::Callable(DeclarationId(2409)),
             inputs: vec![],
             output: PortId(542),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(425),
-            target: TransformTarget::Callable(DeclarationId(2407)),
+            target: TransformTarget::Callable(DeclarationId(2409)),
             inputs: vec![],
             output: PortId(543),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727),
@@ -5364,7 +5364,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(427),
-            target: TransformTarget::Callable(DeclarationId(2407)),
+            target: TransformTarget::Callable(DeclarationId(2409)),
             inputs: vec![],
             output: PortId(546),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769),
@@ -5419,21 +5419,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(429),
-            target: TransformTarget::Callable(DeclarationId(2405)),
+            target: TransformTarget::Callable(DeclarationId(2407)),
             inputs: vec![],
             output: PortId(548),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(2407)),
+            target: TransformTarget::Callable(DeclarationId(2409)),
             inputs: vec![],
             output: PortId(549),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(431),
-            target: TransformTarget::Callable(DeclarationId(2406)),
+            target: TransformTarget::Callable(DeclarationId(2408)),
             inputs: vec![],
             output: PortId(550),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897),
@@ -5449,7 +5449,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(433),
-            target: TransformTarget::Callable(DeclarationId(2406)),
+            target: TransformTarget::Callable(DeclarationId(2408)),
             inputs: vec![],
             output: PortId(553),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943),
@@ -5513,21 +5513,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(436),
-            target: TransformTarget::Callable(DeclarationId(2405)),
+            target: TransformTarget::Callable(DeclarationId(2407)),
             inputs: vec![],
             output: PortId(557),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(437),
-            target: TransformTarget::Callable(DeclarationId(2407)),
+            target: TransformTarget::Callable(DeclarationId(2409)),
             inputs: vec![],
             output: PortId(558),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(438),
-            target: TransformTarget::Callable(DeclarationId(2406)),
+            target: TransformTarget::Callable(DeclarationId(2408)),
             inputs: vec![],
             output: PortId(559),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087),
@@ -5568,14 +5568,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(443),
-            target: TransformTarget::Callable(DeclarationId(1186)),
+            target: TransformTarget::Callable(DeclarationId(1188)),
             inputs: vec![PortId(564)],
             output: PortId(565),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7187, 7217),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(444),
-            target: TransformTarget::Callable(DeclarationId(2404)),
+            target: TransformTarget::Callable(DeclarationId(2406)),
             inputs: vec![PortId(565)],
             output: PortId(566),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219),
@@ -5634,7 +5634,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(2404)),
+            target: TransformTarget::Callable(DeclarationId(2406)),
             inputs: vec![PortId(570)],
             output: PortId(571),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335),
@@ -5780,7 +5780,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(455),
-            target: TransformTarget::Callable(DeclarationId(1193)),
+            target: TransformTarget::Callable(DeclarationId(1195)),
             inputs: vec![PortId(575), PortId(576), PortId(577)],
             output: PortId(578),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7515, 7558),
@@ -5803,7 +5803,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(458),
-            target: TransformTarget::Callable(DeclarationId(1186)),
+            target: TransformTarget::Callable(DeclarationId(1188)),
             inputs: vec![PortId(579)],
             output: PortId(580),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7601, 7613),
@@ -5819,14 +5819,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(460),
-            target: TransformTarget::Callable(DeclarationId(1195)),
+            target: TransformTarget::Callable(DeclarationId(1197)),
             inputs: vec![],
             output: PortId(581),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7693, 7711),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(461),
-            target: TransformTarget::Callable(DeclarationId(2404)),
+            target: TransformTarget::Callable(DeclarationId(2406)),
             inputs: vec![PortId(581)],
             output: PortId(582),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713),
@@ -5849,7 +5849,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(464),
-            target: TransformTarget::Callable(DeclarationId(1193)),
+            target: TransformTarget::Callable(DeclarationId(1195)),
             inputs: vec![PortId(583), PortId(584), PortId(585)],
             output: PortId(586),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7862, 7906),
@@ -5865,7 +5865,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(466),
-            target: TransformTarget::Callable(DeclarationId(2409)),
+            target: TransformTarget::Callable(DeclarationId(2411)),
             inputs: vec![],
             output: PortId(587),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972),
@@ -6004,28 +6004,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(475),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2134)),
             inputs: vec![],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(476),
-            target: TransformTarget::Callable(DeclarationId(2138)),
+            target: TransformTarget::Callable(DeclarationId(2140)),
             inputs: vec![PortId(602)],
             output: PortId(603),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(477),
-            target: TransformTarget::Callable(DeclarationId(1198)),
+            target: TransformTarget::Callable(DeclarationId(1200)),
             inputs: vec![],
             output: PortId(604),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8778, 8809),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(478),
-            target: TransformTarget::Callable(DeclarationId(950)),
+            target: TransformTarget::Callable(DeclarationId(952)),
             inputs: vec![PortId(603), PortId(601), PortId(600), PortId(604)],
             output: PortId(605),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8697, 8813),
@@ -6041,7 +6041,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(480),
-            target: TransformTarget::Callable(DeclarationId(1185)),
+            target: TransformTarget::Callable(DeclarationId(1187)),
             inputs: vec![],
             output: PortId(606),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9153),
@@ -6062,7 +6062,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(483),
-            target: TransformTarget::Callable(DeclarationId(157)),
+            target: TransformTarget::Callable(DeclarationId(159)),
             inputs: vec![PortId(606), PortId(607), PortId(608)],
             output: PortId(609),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9108, 9181),
@@ -6078,7 +6078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(485),
-            target: TransformTarget::Callable(DeclarationId(1236)),
+            target: TransformTarget::Callable(DeclarationId(1238)),
             inputs: vec![PortId(610)],
             output: PortId(612),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9734, 9751),
@@ -6112,35 +6112,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(489),
-            target: TransformTarget::Callable(DeclarationId(1200)),
+            target: TransformTarget::Callable(DeclarationId(1202)),
             inputs: vec![PortId(611), PortId(616)],
             output: PortId(617),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9862, 9926),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(490),
-            target: TransformTarget::Callable(DeclarationId(2166)),
+            target: TransformTarget::Callable(DeclarationId(2168)),
             inputs: vec![PortId(617)],
             output: PortId(618),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(491),
-            target: TransformTarget::Callable(DeclarationId(1201)),
+            target: TransformTarget::Callable(DeclarationId(1203)),
             inputs: vec![],
             output: PortId(619),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10082, 10121),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(492),
-            target: TransformTarget::Callable(DeclarationId(1200)),
+            target: TransformTarget::Callable(DeclarationId(1202)),
             inputs: vec![PortId(611), PortId(619)],
             output: PortId(620),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10002, 10135),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(493),
-            target: TransformTarget::Callable(DeclarationId(2166)),
+            target: TransformTarget::Callable(DeclarationId(2168)),
             inputs: vec![PortId(620)],
             output: PortId(621),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147),
@@ -6186,21 +6186,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(496),
-            target: TransformTarget::Callable(DeclarationId(1199)),
+            target: TransformTarget::Callable(DeclarationId(1201)),
             inputs: vec![PortId(624)],
             output: PortId(625),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10287, 10326),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(497),
-            target: TransformTarget::Callable(DeclarationId(1200)),
+            target: TransformTarget::Callable(DeclarationId(1202)),
             inputs: vec![PortId(611), PortId(625)],
             output: PortId(626),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10215, 10336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(498),
-            target: TransformTarget::Callable(DeclarationId(2166)),
+            target: TransformTarget::Callable(DeclarationId(2168)),
             inputs: vec![PortId(626)],
             output: PortId(627),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344),
@@ -6255,14 +6255,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(502),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10862, 10893),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(503),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(636),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10916, 10947),
@@ -6302,21 +6302,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(2405)),
+            target: TransformTarget::Callable(DeclarationId(2407)),
             inputs: vec![],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(506),
-            target: TransformTarget::Callable(DeclarationId(2406)),
+            target: TransformTarget::Callable(DeclarationId(2408)),
             inputs: vec![],
             output: PortId(639),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(507),
-            target: TransformTarget::Callable(DeclarationId(2407)),
+            target: TransformTarget::Callable(DeclarationId(2409)),
             inputs: vec![],
             output: PortId(640),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030),
@@ -6380,42 +6380,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(510),
-            target: TransformTarget::Callable(DeclarationId(1236)),
+            target: TransformTarget::Callable(DeclarationId(1238)),
             inputs: vec![PortId(642)],
             output: PortId(645),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11930, 11947),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(511),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(645)],
             output: PortId(646),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11921, 11948),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(512),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(647),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11963, 11994),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(2410)),
+            target: TransformTarget::Callable(DeclarationId(2412)),
             inputs: vec![PortId(647)],
             output: PortId(648),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(514),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(649),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12010, 12041),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(515),
-            target: TransformTarget::Callable(DeclarationId(2411)),
+            target: TransformTarget::Callable(DeclarationId(2413)),
             inputs: vec![PortId(649)],
             output: PortId(650),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042),
@@ -6449,42 +6449,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(517),
-            target: TransformTarget::Callable(DeclarationId(1236)),
+            target: TransformTarget::Callable(DeclarationId(1238)),
             inputs: vec![PortId(642)],
             output: PortId(653),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12081, 12098),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(518),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12072, 12099),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(655),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12114, 12145),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(520),
-            target: TransformTarget::Callable(DeclarationId(2412)),
+            target: TransformTarget::Callable(DeclarationId(2414)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(521),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(657),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12161, 12192),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(2413)),
+            target: TransformTarget::Callable(DeclarationId(2415)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193),
@@ -6518,42 +6518,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(524),
-            target: TransformTarget::Callable(DeclarationId(1236)),
+            target: TransformTarget::Callable(DeclarationId(1238)),
             inputs: vec![PortId(642)],
             output: PortId(661),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12229, 12246),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(661)],
             output: PortId(662),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12220, 12247),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(663),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12262, 12293),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(527),
-            target: TransformTarget::Callable(DeclarationId(2414)),
+            target: TransformTarget::Callable(DeclarationId(2416)),
             inputs: vec![PortId(663)],
             output: PortId(664),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(528),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12309, 12340),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(2415)),
+            target: TransformTarget::Callable(DeclarationId(2417)),
             inputs: vec![PortId(665)],
             output: PortId(666),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341),
@@ -6587,42 +6587,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(531),
-            target: TransformTarget::Callable(DeclarationId(1236)),
+            target: TransformTarget::Callable(DeclarationId(1238)),
             inputs: vec![PortId(642)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12375, 12392),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(532),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(669)],
             output: PortId(670),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12366, 12393),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(533),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(671),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12408, 12439),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(534),
-            target: TransformTarget::Callable(DeclarationId(2416)),
+            target: TransformTarget::Callable(DeclarationId(2418)),
             inputs: vec![PortId(671)],
             output: PortId(672),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(535),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(673),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12455, 12486),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(536),
-            target: TransformTarget::Callable(DeclarationId(2417)),
+            target: TransformTarget::Callable(DeclarationId(2419)),
             inputs: vec![PortId(673)],
             output: PortId(674),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487),
@@ -6656,42 +6656,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(1236)),
+            target: TransformTarget::Callable(DeclarationId(1238)),
             inputs: vec![PortId(642)],
             output: PortId(677),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12521, 12538),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(539),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(677)],
             output: PortId(678),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12512, 12539),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12585),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(541),
-            target: TransformTarget::Callable(DeclarationId(2418)),
+            target: TransformTarget::Callable(DeclarationId(2420)),
             inputs: vec![PortId(679)],
             output: PortId(680),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(1192)),
+            target: TransformTarget::Callable(DeclarationId(1194)),
             inputs: vec![],
             output: PortId(681),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12601, 12632),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(543),
-            target: TransformTarget::Callable(DeclarationId(2419)),
+            target: TransformTarget::Callable(DeclarationId(2421)),
             inputs: vec![PortId(681)],
             output: PortId(682),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633),
@@ -6812,28 +6812,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(1236)),
+            target: TransformTarget::Callable(DeclarationId(1238)),
             inputs: vec![PortId(685)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12793, 12810),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(549),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(689)],
             output: PortId(690),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12784, 12811),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(550),
-            target: TransformTarget::Callable(DeclarationId(2165)),
+            target: TransformTarget::Callable(DeclarationId(2167)),
             inputs: vec![],
             output: PortId(691),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(2165)),
+            target: TransformTarget::Callable(DeclarationId(2167)),
             inputs: vec![],
             output: PortId(692),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847),
@@ -6868,7 +6868,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Value(ValueNode { id: NodeId(553), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(694), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12926, 13053), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(554),
-            target: TransformTarget::Callable(DeclarationId(1202)),
+            target: TransformTarget::Callable(DeclarationId(1204)),
             inputs: vec![PortId(685), PortId(694)],
             output: PortId(695),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12872, 13061),
@@ -6876,7 +6876,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Value(ValueNode { id: NodeId(555), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(696), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13139, 13262), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(556),
-            target: TransformTarget::Callable(DeclarationId(1202)),
+            target: TransformTarget::Callable(DeclarationId(1204)),
             inputs: vec![PortId(685), PortId(696)],
             output: PortId(697),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13085, 13270),
@@ -6884,7 +6884,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Value(ValueNode { id: NodeId(557), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(698), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13344, 13472), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(558),
-            target: TransformTarget::Callable(DeclarationId(1202)),
+            target: TransformTarget::Callable(DeclarationId(1204)),
             inputs: vec![PortId(685), PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13290, 13480),
@@ -7517,7 +7517,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(2579);
+        let mut declarations = Vec::with_capacity(2581);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -7525,11 +7525,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "True".to_string(),
-                        ty: DeclarationId(308),
+                        ty: DeclarationId(310),
                     },
                     Field {
                         label: "False".to_string(),
-                        ty: DeclarationId(309),
+                        ty: DeclarationId(311),
                     },
                 ],
             },
@@ -7620,7 +7620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bits".to_string(),
-                    ty: DeclarationId(310),
+                    ty: DeclarationId(312),
                 }],
             },
             type_params: vec![],
@@ -7639,7 +7639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bits".to_string(),
-                    ty: DeclarationId(311),
+                    ty: DeclarationId(313),
                 }],
             },
             type_params: vec![],
@@ -7658,7 +7658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(312),
+                    ty: DeclarationId(314),
                 }],
             },
             type_params: vec![],
@@ -7677,7 +7677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(313),
+                    ty: DeclarationId(315),
                 }],
             },
             type_params: vec![],
@@ -7696,7 +7696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(314),
+                    ty: DeclarationId(316),
                 }],
             },
             type_params: vec![],
@@ -7715,7 +7715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(315),
+                    ty: DeclarationId(317),
                 }],
             },
             type_params: vec![],
@@ -7735,11 +7735,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Ok".to_string(),
-                        ty: DeclarationId(316),
+                        ty: DeclarationId(318),
                     },
                     Field {
                         label: "Err".to_string(),
-                        ty: DeclarationId(317),
+                        ty: DeclarationId(319),
                     },
                 ],
             },
@@ -7788,11 +7788,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByZero".to_string(),
-                        ty: DeclarationId(318),
+                        ty: DeclarationId(320),
                     },
                     Field {
                         label: "Overflow".to_string(),
-                        ty: DeclarationId(319),
+                        ty: DeclarationId(321),
                     },
                 ],
             },
@@ -7812,7 +7812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "op".to_string(),
-                    ty: DeclarationId(329),
+                    ty: DeclarationId(331),
                 }],
             },
             type_params: vec![DeclarationId(16)],
@@ -7845,7 +7845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "op".to_string(),
-                    ty: DeclarationId(330),
+                    ty: DeclarationId(332),
                 }],
             },
             type_params: vec![DeclarationId(18)],
@@ -7879,7 +7879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(331),
+                        ty: DeclarationId(333),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -7918,7 +7918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(332),
+                        ty: DeclarationId(334),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -7957,7 +7957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(333),
+                        ty: DeclarationId(335),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -7965,7 +7965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inverse".to_string(),
-                        ty: DeclarationId(334),
+                        ty: DeclarationId(336),
                     },
                 ],
             },
@@ -8000,7 +8000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(335),
+                        ty: DeclarationId(337),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -8008,7 +8008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inverse".to_string(),
-                        ty: DeclarationId(336),
+                        ty: DeclarationId(338),
                     },
                 ],
             },
@@ -8099,7 +8099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(337),
+                        ty: DeclarationId(339),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8107,7 +8107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(338),
+                        ty: DeclarationId(340),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8146,7 +8146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(339),
+                        ty: DeclarationId(341),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8154,7 +8154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(340),
+                        ty: DeclarationId(342),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8193,7 +8193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(341),
+                        ty: DeclarationId(343),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8201,11 +8201,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(342),
+                        ty: DeclarationId(344),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(343),
+                        ty: DeclarationId(345),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8244,11 +8244,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(344),
+                        ty: DeclarationId(346),
                     },
                     Field {
                         label: "sub".to_string(),
-                        ty: DeclarationId(345),
+                        ty: DeclarationId(347),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8256,15 +8256,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(346),
+                        ty: DeclarationId(348),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(347),
+                        ty: DeclarationId(349),
                     },
                     Field {
                         label: "div".to_string(),
-                        ty: DeclarationId(349),
+                        ty: DeclarationId(351),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8272,31 +8272,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "compare".to_string(),
-                        ty: DeclarationId(350),
+                        ty: DeclarationId(352),
                     },
                     Field {
                         label: "eq".to_string(),
-                        ty: DeclarationId(351),
+                        ty: DeclarationId(353),
                     },
                     Field {
                         label: "ne".to_string(),
-                        ty: DeclarationId(352),
+                        ty: DeclarationId(354),
                     },
                     Field {
                         label: "lt".to_string(),
-                        ty: DeclarationId(353),
+                        ty: DeclarationId(355),
                     },
                     Field {
                         label: "le".to_string(),
-                        ty: DeclarationId(354),
+                        ty: DeclarationId(356),
                     },
                     Field {
                         label: "gt".to_string(),
-                        ty: DeclarationId(355),
+                        ty: DeclarationId(357),
                     },
                     Field {
                         label: "ge".to_string(),
-                        ty: DeclarationId(356),
+                        ty: DeclarationId(358),
                     },
                 ],
             },
@@ -8331,7 +8331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(357),
+                        ty: DeclarationId(359),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8339,11 +8339,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(358),
+                        ty: DeclarationId(360),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(359),
+                        ty: DeclarationId(361),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8351,11 +8351,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "reciprocal".to_string(),
-                        ty: DeclarationId(360),
+                        ty: DeclarationId(362),
                     },
                     Field {
                         label: "compare".to_string(),
-                        ty: DeclarationId(361),
+                        ty: DeclarationId(363),
                     },
                 ],
             },
@@ -8390,11 +8390,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(362),
+                        ty: DeclarationId(364),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(363),
+                        ty: DeclarationId(365),
                     },
                 ],
             },
@@ -8429,11 +8429,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(364),
+                        ty: DeclarationId(366),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(365),
+                        ty: DeclarationId(367),
                     },
                     Field {
                         label: "top".to_string(),
@@ -8476,15 +8476,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(366),
+                        ty: DeclarationId(368),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(367),
+                        ty: DeclarationId(369),
                     },
                     Field {
                         label: "complement".to_string(),
-                        ty: DeclarationId(368),
+                        ty: DeclarationId(370),
                     },
                     Field {
                         label: "top".to_string(),
@@ -8527,87 +8527,87 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "concat".to_string(),
-                        ty: DeclarationId(372),
+                        ty: DeclarationId(374),
                     },
                     Field {
                         label: "empty".to_string(),
-                        ty: DeclarationId(373),
+                        ty: DeclarationId(375),
                     },
                     Field {
                         label: "append".to_string(),
-                        ty: DeclarationId(375),
+                        ty: DeclarationId(377),
                     },
                     Field {
                         label: "slice".to_string(),
-                        ty: DeclarationId(377),
+                        ty: DeclarationId(379),
                     },
                     Field {
                         label: "length".to_string(),
-                        ty: DeclarationId(378),
+                        ty: DeclarationId(380),
                     },
                     Field {
                         label: "is_empty".to_string(),
-                        ty: DeclarationId(379),
+                        ty: DeclarationId(381),
                     },
                     Field {
                         label: "count".to_string(),
-                        ty: DeclarationId(380),
+                        ty: DeclarationId(382),
                     },
                     Field {
                         label: "first".to_string(),
-                        ty: DeclarationId(382),
+                        ty: DeclarationId(384),
                     },
                     Field {
                         label: "last".to_string(),
-                        ty: DeclarationId(384),
+                        ty: DeclarationId(386),
                     },
                     Field {
                         label: "map".to_string(),
-                        ty: DeclarationId(387),
+                        ty: DeclarationId(389),
                     },
                     Field {
                         label: "filter".to_string(),
-                        ty: DeclarationId(390),
+                        ty: DeclarationId(392),
                     },
                     Field {
                         label: "fold".to_string(),
-                        ty: DeclarationId(392),
+                        ty: DeclarationId(394),
                     },
                     Field {
                         label: "flat_map".to_string(),
-                        ty: DeclarationId(396),
+                        ty: DeclarationId(398),
                     },
                     Field {
                         label: "any".to_string(),
-                        ty: DeclarationId(398),
+                        ty: DeclarationId(400),
                     },
                     Field {
                         label: "all".to_string(),
-                        ty: DeclarationId(400),
+                        ty: DeclarationId(402),
                     },
                     Field {
                         label: "enumerate".to_string(),
-                        ty: DeclarationId(404),
+                        ty: DeclarationId(406),
                     },
                     Field {
                         label: "reverse".to_string(),
-                        ty: DeclarationId(406),
+                        ty: DeclarationId(408),
                     },
                     Field {
                         label: "skip".to_string(),
-                        ty: DeclarationId(408),
+                        ty: DeclarationId(410),
                     },
                     Field {
                         label: "take".to_string(),
-                        ty: DeclarationId(410),
+                        ty: DeclarationId(412),
                     },
                     Field {
                         label: "sort_by".to_string(),
-                        ty: DeclarationId(413),
+                        ty: DeclarationId(415),
                     },
                     Field {
                         label: "contains".to_string(),
-                        ty: DeclarationId(414),
+                        ty: DeclarationId(416),
                     },
                 ],
             },
@@ -8642,43 +8642,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lookup".to_string(),
-                        ty: DeclarationId(416),
+                        ty: DeclarationId(418),
                     },
                     Field {
                         label: "empty".to_string(),
-                        ty: DeclarationId(417),
+                        ty: DeclarationId(419),
                     },
                     Field {
                         label: "get".to_string(),
-                        ty: DeclarationId(419),
+                        ty: DeclarationId(421),
                     },
                     Field {
                         label: "insert".to_string(),
-                        ty: DeclarationId(421),
+                        ty: DeclarationId(423),
                     },
                     Field {
                         label: "merge".to_string(),
-                        ty: DeclarationId(424),
+                        ty: DeclarationId(426),
                     },
                     Field {
                         label: "keys".to_string(),
-                        ty: DeclarationId(426),
+                        ty: DeclarationId(428),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(428),
+                        ty: DeclarationId(430),
                     },
                     Field {
                         label: "has".to_string(),
-                        ty: DeclarationId(429),
+                        ty: DeclarationId(431),
                     },
                     Field {
                         label: "contains_key".to_string(),
-                        ty: DeclarationId(430),
+                        ty: DeclarationId(432),
                     },
                     Field {
                         label: "size".to_string(),
-                        ty: DeclarationId(431),
+                        ty: DeclarationId(433),
                     },
                 ],
             },
@@ -8727,15 +8727,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Less".to_string(),
-                        ty: DeclarationId(432),
+                        ty: DeclarationId(434),
                     },
                     Field {
                         label: "Equal".to_string(),
-                        ty: DeclarationId(433),
+                        ty: DeclarationId(435),
                     },
                     Field {
                         label: "Greater".to_string(),
-                        ty: DeclarationId(434),
+                        ty: DeclarationId(436),
                     },
                 ],
             },
@@ -8756,31 +8756,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OrderedRingProfile".to_string(),
-                        ty: DeclarationId(435),
+                        ty: DeclarationId(437),
                     },
                     Field {
                         label: "ApproximateFieldProfile".to_string(),
-                        ty: DeclarationId(436),
+                        ty: DeclarationId(438),
                     },
                     Field {
                         label: "BooleanAlgebraProfile".to_string(),
-                        ty: DeclarationId(437),
+                        ty: DeclarationId(439),
                     },
                     Field {
                         label: "BooleanAlgebraCollectionProfile".to_string(),
-                        ty: DeclarationId(438),
+                        ty: DeclarationId(440),
                     },
                     Field {
                         label: "FreeMonoidScalarProfile".to_string(),
-                        ty: DeclarationId(439),
+                        ty: DeclarationId(441),
                     },
                     Field {
                         label: "FreeMonoidCollectionProfile".to_string(),
-                        ty: DeclarationId(440),
+                        ty: DeclarationId(442),
                     },
                     Field {
                         label: "PartialFunctionProfile".to_string(),
-                        ty: DeclarationId(441),
+                        ty: DeclarationId(443),
                     },
                 ],
             },
@@ -8801,11 +8801,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SameAsReceiver".to_string(),
-                        ty: DeclarationId(442),
+                        ty: DeclarationId(444),
                     },
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(443),
+                        ty: DeclarationId(445),
                     },
                 ],
             },
@@ -8826,43 +8826,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReceiverSelf".to_string(),
-                        ty: DeclarationId(444),
+                        ty: DeclarationId(446),
                     },
                     Field {
                         label: "ReceiverElement".to_string(),
-                        ty: DeclarationId(445),
+                        ty: DeclarationId(447),
                     },
                     Field {
                         label: "ReceiverKey".to_string(),
-                        ty: DeclarationId(446),
+                        ty: DeclarationId(448),
                     },
                     Field {
                         label: "ReceiverValue".to_string(),
-                        ty: DeclarationId(447),
+                        ty: DeclarationId(449),
                     },
                     Field {
                         label: "NamedTemplate".to_string(),
-                        ty: DeclarationId(448),
+                        ty: DeclarationId(450),
                     },
                     Field {
                         label: "ContainerOf".to_string(),
-                        ty: DeclarationId(449),
+                        ty: DeclarationId(451),
                     },
                     Field {
                         label: "OptionalOf".to_string(),
-                        ty: DeclarationId(450),
+                        ty: DeclarationId(452),
                     },
                     Field {
                         label: "TupleOf".to_string(),
-                        ty: DeclarationId(451),
+                        ty: DeclarationId(453),
                     },
                     Field {
                         label: "CallableOf".to_string(),
-                        ty: DeclarationId(453),
+                        ty: DeclarationId(455),
                     },
                     Field {
                         label: "AlgebraTypeVariable".to_string(),
-                        ty: DeclarationId(454),
+                        ty: DeclarationId(456),
                     },
                 ],
             },
@@ -8883,15 +8883,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(455),
+                        ty: DeclarationId(457),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(456),
+                        ty: DeclarationId(458),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(457),
+                        ty: DeclarationId(459),
                     },
                 ],
             },
@@ -8912,19 +8912,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(458),
+                        ty: DeclarationId(460),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(459),
+                        ty: DeclarationId(461),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(460),
+                        ty: DeclarationId(462),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(461),
+                        ty: DeclarationId(463),
                     },
                 ],
             },
@@ -8945,11 +8945,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "param_types".to_string(),
-                        ty: DeclarationId(462),
+                        ty: DeclarationId(464),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -8957,15 +8957,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(463),
+                        ty: DeclarationId(465),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(464),
+                        ty: DeclarationId(466),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(465),
+                        ty: DeclarationId(467),
                     },
                 ],
             },
@@ -8983,21 +8983,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(59),
             name: Some("kernel_algebra_profile".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(53),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(466)),
+            meta_tag: Some(DeclarationId(468)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -9005,49 +9005,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "Int".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(435),
+                            constructor: DeclarationId(437),
                             payload: vec![],
                         },
                     ),
                     (
                         "Float".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(436),
+                            constructor: DeclarationId(438),
                             payload: vec![],
                         },
                     ),
                     (
                         "Bool".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(437),
+                            constructor: DeclarationId(439),
                             payload: vec![],
                         },
                     ),
                     (
                         "String".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(439),
+                            constructor: DeclarationId(441),
                             payload: vec![],
                         },
                     ),
                     (
                         "List".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(440),
+                            constructor: DeclarationId(442),
                             payload: vec![],
                         },
                     ),
                     (
                         "Set".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(438),
+                            constructor: DeclarationId(440),
                             payload: vec![],
                         },
                     ),
                     (
                         "Map".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(441),
+                            constructor: DeclarationId(443),
                             payload: vec![],
                         },
                     ),
@@ -9063,7 +9063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ordered_ring_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(320),
+                output: DeclarationId(322),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 24213, 25355)),
             },
             type_params: vec![],
@@ -9081,7 +9081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("approximate_field_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(321),
+                output: DeclarationId(323),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 25420, 26514)),
             },
             type_params: vec![],
@@ -9099,7 +9099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("boolean_algebra_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(322),
+                output: DeclarationId(324),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 26577, 27338)),
             },
             type_params: vec![],
@@ -9117,7 +9117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("boolean_algebra_collection_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(323),
+                output: DeclarationId(325),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 27703, 31048)),
             },
             type_params: vec![],
@@ -9135,7 +9135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("free_monoid_scalar_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(324),
+                output: DeclarationId(326),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 31114, 34351)),
             },
             type_params: vec![],
@@ -9153,7 +9153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("free_monoid_collection_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(325),
+                output: DeclarationId(327),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 34421, 39686)),
             },
             type_params: vec![],
@@ -9171,7 +9171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("partial_function_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(326),
+                output: DeclarationId(328),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 39750, 42574)),
             },
             type_params: vec![],
@@ -9189,7 +9189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_templates_for_profile".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(327),
+                output: DeclarationId(329),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 42664, 43127)),
             },
             type_params: vec![],
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_type_param_names".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(328),
+                output: DeclarationId(330),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 43469, 43750)),
             },
             type_params: vec![],
@@ -9282,7 +9282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Phantom".to_string(),
-                    ty: DeclarationId(467),
+                    ty: DeclarationId(469),
                 }],
             },
             type_params: vec![DeclarationId(74), DeclarationId(75)],
@@ -9357,7 +9357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(468),
+                        value: DeclarationId(470),
                     },
                 ],
             },
@@ -9383,7 +9383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(469),
+                        value: DeclarationId(471),
                     },
                 ],
             },
@@ -9409,7 +9409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(470),
+                        value: DeclarationId(472),
                     },
                 ],
             },
@@ -9435,7 +9435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(471),
+                        value: DeclarationId(473),
                     },
                 ],
             },
@@ -9461,7 +9461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(472),
+                        value: DeclarationId(474),
                     },
                 ],
             },
@@ -9487,7 +9487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(473),
+                        value: DeclarationId(475),
                     },
                 ],
             },
@@ -9513,7 +9513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(474),
+                        value: DeclarationId(476),
                     },
                 ],
             },
@@ -9539,7 +9539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(475),
+                        value: DeclarationId(477),
                     },
                 ],
             },
@@ -9565,7 +9565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(476),
+                        value: DeclarationId(478),
                     },
                 ],
             },
@@ -9591,7 +9591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(477),
+                        value: DeclarationId(479),
                     },
                 ],
             },
@@ -9714,7 +9714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(478),
+                    value: DeclarationId(480),
                 }],
             },
             type_params: vec![],
@@ -9756,7 +9756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(479),
+                        value: DeclarationId(481),
                     },
                 ],
             },
@@ -9782,7 +9782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(480),
+                        value: DeclarationId(482),
                     },
                 ],
             },
@@ -9823,7 +9823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(481)),
+            refinement: Some(DeclarationId(483)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/integer.dag", 9519, 9558),
         });
@@ -9834,7 +9834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(39),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(40),
-                    value: DeclarationId(482),
+                    value: DeclarationId(484),
                 }],
             },
             type_params: vec![],
@@ -9854,23 +9854,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToNearestEven".to_string(),
-                        ty: DeclarationId(483),
+                        ty: DeclarationId(485),
                     },
                     Field {
                         label: "ToZero".to_string(),
-                        ty: DeclarationId(484),
+                        ty: DeclarationId(486),
                     },
                     Field {
                         label: "ToPositiveInfinity".to_string(),
-                        ty: DeclarationId(485),
+                        ty: DeclarationId(487),
                     },
                     Field {
                         label: "ToNegativeInfinity".to_string(),
-                        ty: DeclarationId(486),
+                        ty: DeclarationId(488),
                     },
                     Field {
                         label: "ToAwayFromZero".to_string(),
-                        ty: DeclarationId(487),
+                        ty: DeclarationId(489),
                     },
                 ],
             },
@@ -9891,15 +9891,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(488),
+                        ty: DeclarationId(490),
                     },
                     Field {
                         label: "BinaryPrecision".to_string(),
-                        ty: DeclarationId(489),
+                        ty: DeclarationId(491),
                     },
                     Field {
                         label: "DecimalPrecision".to_string(),
-                        ty: DeclarationId(490),
+                        ty: DeclarationId(492),
                     },
                 ],
             },
@@ -9920,15 +9920,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoNaN".to_string(),
-                        ty: DeclarationId(491),
+                        ty: DeclarationId(493),
                     },
                     Field {
                         label: "QuietNaN".to_string(),
-                        ty: DeclarationId(492),
+                        ty: DeclarationId(494),
                     },
                     Field {
                         label: "QuietAndSignalingNaN".to_string(),
-                        ty: DeclarationId(493),
+                        ty: DeclarationId(495),
                     },
                 ],
             },
@@ -9949,11 +9949,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoInfinity".to_string(),
-                        ty: DeclarationId(494),
+                        ty: DeclarationId(496),
                     },
                     Field {
                         label: "SignedInfinity".to_string(),
-                        ty: DeclarationId(495),
+                        ty: DeclarationId(497),
                     },
                 ],
             },
@@ -9974,11 +9974,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSignedZero".to_string(),
-                        ty: DeclarationId(496),
+                        ty: DeclarationId(498),
                     },
                     Field {
                         label: "SignedZero".to_string(),
-                        ty: DeclarationId(497),
+                        ty: DeclarationId(499),
                     },
                 ],
             },
@@ -9999,15 +9999,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSubnormals".to_string(),
-                        ty: DeclarationId(498),
+                        ty: DeclarationId(500),
                     },
                     Field {
                         label: "GradualUnderflow".to_string(),
-                        ty: DeclarationId(499),
+                        ty: DeclarationId(501),
                     },
                     Field {
                         label: "FlushToZero".to_string(),
-                        ty: DeclarationId(500),
+                        ty: DeclarationId(502),
                     },
                 ],
             },
@@ -10057,7 +10057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(501),
+                        ty: DeclarationId(503),
                     },
                     Field {
                         label: "rounding".to_string(),
@@ -10113,21 +10113,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1216, 1233),
+            span: SourceSpan::new("dsl/std/float.dag", 1248, 1265),
         });
         declarations.push(Declaration {
             id: DeclarationId(110),
-            name: Some("Float32".to_string()),
+            name: Some("Real".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(107),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(108),
+                    value: DeclarationId(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("dsl/std/float.dag", 1446, 1497),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(111),
+            name: Some("Real32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(73),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(74),
-                        value: DeclarationId(109),
+                        value: DeclarationId(110),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(502),
+                        value: DeclarationId(505),
                     },
                 ],
             },
@@ -10139,21 +10159,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1235, 1293),
+            span: SourceSpan::new("dsl/std/float.dag", 1719, 1768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(111),
-            name: Some("Float64".to_string()),
+            id: DeclarationId(112),
+            name: Some("Real64".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(73),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(74),
-                        value: DeclarationId(109),
+                        value: DeclarationId(110),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(503),
+                        value: DeclarationId(506),
                     },
                 ],
             },
@@ -10165,11 +10185,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1294, 1352),
+            span: SourceSpan::new("dsl/std/float.dag", 1769, 1818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(112),
-            name: Some("Float".to_string()),
+            id: DeclarationId(113),
+            name: Some("Float32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(111),
                 arguments: vec![],
@@ -10182,17 +10202,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1371, 1391),
+            span: SourceSpan::new("dsl/std/float.dag", 1820, 1841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(113),
-            name: Some("Real".to_string()),
+            id: DeclarationId(114),
+            name: Some("Float64".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(107),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(108),
-                    value: DeclarationId(504),
-                }],
+                template: DeclarationId(112),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -10202,27 +10219,44 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1572, 1623),
+            span: SourceSpan::new("dsl/std/float.dag", 1842, 1863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(114),
+            id: DeclarationId(115),
+            name: Some("Float".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(114),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("dsl/std/float.dag", 1882, 1902),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(116),
             name: Some("kernel_type_set".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(618)),
+            meta_tag: Some(DeclarationId(620)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10267,11 +10301,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3041, 3206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(115),
+            id: DeclarationId(117),
             name: Some("is_kernel_type".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3248, 3344)),
             },
             type_params: vec![],
@@ -10285,24 +10319,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3208, 3344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(116),
+            id: DeclarationId(118),
             name: Some("container_type_arity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(93),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(619)),
+            meta_tag: Some(DeclarationId(621)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10327,11 +10361,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3506, 3587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(117),
+            id: DeclarationId(119),
             name: Some("is_container_type".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3632, 3734)),
             },
             type_params: vec![],
@@ -10345,11 +10379,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3589, 3734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(118),
+            id: DeclarationId(120),
             name: Some("container_expected_arity".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(505),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(507),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3786, 3827)),
             },
             type_params: vec![],
@@ -10363,11 +10397,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3736, 3827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(119),
+            id: DeclarationId(121),
             name: Some("container_param_names_for".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(506),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(508),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4067, 4204)),
             },
             type_params: vec![],
@@ -10381,11 +10415,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4003, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(120),
+            id: DeclarationId(122),
             name: Some("container_param_name".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(507),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(509),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4272, 4512)),
             },
             type_params: vec![],
@@ -10399,24 +10433,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4206, 4512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(121),
+            id: DeclarationId(123),
             name: Some("ordered_element_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(620)),
+            meta_tag: Some(DeclarationId(622)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10431,11 +10465,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4706, 4778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(122),
+            id: DeclarationId(124),
             name: Some("is_ordered_element_collection".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4835, 4892)),
             },
             type_params: vec![],
@@ -10449,24 +10483,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4780, 4892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(123),
+            id: DeclarationId(125),
             name: Some("container_template_algebra_rows".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(621)),
+            meta_tag: Some(DeclarationId(623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10527,11 +10561,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 5684, 6123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(124),
+            id: DeclarationId(126),
             name: Some("container_template_algebra".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(508),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(510),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 6180, 6232)),
             },
             type_params: vec![],
@@ -10545,11 +10579,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6125, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(125),
+            id: DeclarationId(127),
             name: Some("canonical_container_names".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(509),
+                output: DeclarationId(511),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 6521, 6600)),
             },
             type_params: vec![],
@@ -10563,17 +10597,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6474, 6600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(126),
+            id: DeclarationId(128),
             name: Some("Bool".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "True".to_string(),
-                        ty: DeclarationId(510),
+                        ty: DeclarationId(512),
                     },
                     Field {
                         label: "False".to_string(),
-                        ty: DeclarationId(511),
+                        ty: DeclarationId(513),
                     },
                 ],
             },
@@ -10581,14 +10615,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(664)),
+            inhabits: Some(DeclarationId(666)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 7574, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(127),
+            id: DeclarationId(129),
             name: Some("Unit".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10602,7 +10636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7666, 7675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(128),
+            id: DeclarationId(130),
             name: Some("Json".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10616,7 +10650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7792, 7801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(129),
+            id: DeclarationId(131),
             name: Some("Bytes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10630,7 +10664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7802, 7812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(130),
+            id: DeclarationId(132),
             name: Some("Char".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -10647,16 +10681,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 8503, 8518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(131),
+            id: DeclarationId(133),
             name: Some("List".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(132),
+                    value: DeclarationId(134),
                 }],
             },
-            type_params: vec![DeclarationId(132)],
+            type_params: vec![DeclarationId(134)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -10667,7 +10701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9282, 9322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(132),
+            id: DeclarationId(134),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -10681,16 +10715,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9282, 9322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(133),
+            id: DeclarationId(135),
             name: Some("Set".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(45),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(46),
-                    value: DeclarationId(134),
+                    value: DeclarationId(136),
                 }],
             },
-            type_params: vec![DeclarationId(134)],
+            type_params: vec![DeclarationId(136)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -10701,7 +10735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9323, 9366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(134),
+            id: DeclarationId(136),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -10715,22 +10749,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9323, 9366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(135),
+            id: DeclarationId(137),
             name: Some("Map".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(50),
-                        value: DeclarationId(136),
+                        value: DeclarationId(138),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(51),
-                        value: DeclarationId(137),
+                        value: DeclarationId(139),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(136), DeclarationId(137)],
+            type_params: vec![DeclarationId(138), DeclarationId(139)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -10741,7 +10775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(136),
+            id: DeclarationId(138),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("key".to_string())),
             type_params: vec![],
@@ -10755,7 +10789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(137),
+            id: DeclarationId(139),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -10769,10 +10803,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(138),
+            id: DeclarationId(140),
             name: Some("CommitSha".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10786,10 +10820,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10763, 10789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(139),
+            id: DeclarationId(141),
             name: Some("Sha256".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10803,7 +10837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10857, 10883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(140),
+            id: DeclarationId(142),
             name: Some("RetryCount".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -10812,12 +10846,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(622)),
+            refinement: Some(DeclarationId(624)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 10884, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(141),
+            id: DeclarationId(143),
             name: Some("HttpStatus".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -10826,15 +10860,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(623)),
+            refinement: Some(DeclarationId(625)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 10936, 10991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(142),
+            id: DeclarationId(144),
             name: Some("Email".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10848,7 +10882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11065, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(143),
+            id: DeclarationId(145),
             name: Some("Port".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -10857,15 +10891,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(624)),
+            refinement: Some(DeclarationId(626)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11092, 11147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(144),
+            id: DeclarationId(146),
             name: Some("GistId".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10879,10 +10913,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11236, 11262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(145),
+            id: DeclarationId(147),
             name: Some("Secret".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10898,24 +10932,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11263, 11304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(146),
+            id: DeclarationId(148),
             name: Some("SecretValue".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(145))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(147))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(625)),
+            refinement: Some(DeclarationId(627)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11305, 11347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(147),
+            id: DeclarationId(149),
             name: Some("Url".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10929,10 +10963,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11408, 11434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(148),
+            id: DeclarationId(150),
             name: Some("SemVer".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10946,82 +10980,82 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11507, 11533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(149),
+            id: DeclarationId(151),
             name: Some("NonEmptyStr".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(626)),
+            refinement: Some(DeclarationId(628)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11534, 11579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(150),
+            id: DeclarationId(152),
             name: Some("LanguageId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(627)),
+            refinement: Some(DeclarationId(629)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11580, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(151),
+            id: DeclarationId(153),
             name: Some("SecretName".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(628)),
+            refinement: Some(DeclarationId(630)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11626, 11671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(152),
+            id: DeclarationId(154),
             name: Some("PathSegment".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(629)),
+            refinement: Some(DeclarationId(631)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12306, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(153),
+            id: DeclarationId(155),
             name: Some("GlobSegment".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(630)),
+            refinement: Some(DeclarationId(632)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12366, 12425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(154),
+            id: DeclarationId(156),
             name: Some("FilePathParts".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segments".to_string(),
-                    ty: DeclarationId(512),
+                    ty: DeclarationId(514),
                 }],
             },
             type_params: vec![],
@@ -11035,12 +11069,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12426, 12478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(155),
+            id: DeclarationId(157),
             name: Some("GlobPattern".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segments".to_string(),
-                    ty: DeclarationId(513),
+                    ty: DeclarationId(515),
                 }],
             },
             type_params: vec![],
@@ -11054,27 +11088,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12479, 12529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(156),
+            id: DeclarationId(158),
             name: Some("FilePath".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(631)),
+            refinement: Some(DeclarationId(633)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12530, 12573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(157),
+            id: DeclarationId(159),
             name: Some("SourceSpan".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "start".to_string(),
@@ -11097,10 +11131,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13191, 13251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(158),
+            id: DeclarationId(160),
             name: Some("Timestamp".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11114,7 +11148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13351, 13377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(159),
+            id: DeclarationId(161),
             name: Some("EpochMs".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11123,12 +11157,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(632)),
+            refinement: Some(DeclarationId(634)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13378, 13422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(160),
+            id: DeclarationId(162),
             name: Some("Duration".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11137,12 +11171,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(633)),
+            refinement: Some(DeclarationId(635)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13423, 13467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(161),
+            id: DeclarationId(163),
             name: Some("Milliseconds".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11151,12 +11185,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(634)),
+            refinement: Some(DeclarationId(636)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13949, 13993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(162),
+            id: DeclarationId(164),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11165,225 +11199,225 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(635)),
+            refinement: Some(DeclarationId(637)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13994, 14038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(163),
+            id: DeclarationId(165),
             name: Some("IntentId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(636)),
+            refinement: Some(DeclarationId(638)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14562, 14617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(164),
+            id: DeclarationId(166),
             name: Some("IssueId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(637)),
+            refinement: Some(DeclarationId(639)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14618, 14672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(165),
+            id: DeclarationId(167),
             name: Some("RunKey".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(638)),
+            refinement: Some(DeclarationId(640)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14673, 14726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(166),
+            id: DeclarationId(168),
             name: Some("ArtifactId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(639)),
+            refinement: Some(DeclarationId(641)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14727, 14784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(167),
+            id: DeclarationId(169),
             name: Some("LeaseToken".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(640)),
+            refinement: Some(DeclarationId(642)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14785, 14842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(168),
+            id: DeclarationId(170),
             name: Some("WorkerId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(641)),
+            refinement: Some(DeclarationId(643)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14843, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(169),
+            id: DeclarationId(171),
             name: Some("CommentId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(642)),
+            refinement: Some(DeclarationId(644)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14899, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(170),
+            id: DeclarationId(172),
             name: Some("SignalKey".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(643)),
+            refinement: Some(DeclarationId(645)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14956, 15012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(171),
+            id: DeclarationId(173),
             name: Some("ContentHash".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(644)),
+            refinement: Some(DeclarationId(646)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15013, 15071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(172),
+            id: DeclarationId(174),
             name: Some("WorkflowProducerId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(645)),
+            refinement: Some(DeclarationId(647)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15302, 15373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(173),
+            id: DeclarationId(175),
             name: Some("WorkflowObserverId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(646)),
+            refinement: Some(DeclarationId(648)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15374, 15445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(174),
+            id: DeclarationId(176),
             name: Some("WorkflowProverId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(647)),
+            refinement: Some(DeclarationId(649)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15446, 15513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(175),
+            id: DeclarationId(177),
             name: Some("WorkflowRunId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(648)),
+            refinement: Some(DeclarationId(650)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15514, 15575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(176),
+            id: DeclarationId(178),
             name: Some("GitRef".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(649)),
+            refinement: Some(DeclarationId(651)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15655, 15697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(177),
+            id: DeclarationId(179),
             name: Some("GcpProjectId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(650)),
+            refinement: Some(DeclarationId(652)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 16082, 16124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(178),
+            id: DeclarationId(180),
             name: Some("ServiceAccountEmail".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11397,21 +11431,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16249, 16282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(179),
+            id: DeclarationId(181),
             name: Some("Platform".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Linux".to_string(),
-                        ty: DeclarationId(514),
+                        ty: DeclarationId(516),
                     },
                     Field {
                         label: "Macos".to_string(),
-                        ty: DeclarationId(515),
+                        ty: DeclarationId(517),
                     },
                     Field {
                         label: "Windows".to_string(),
-                        ty: DeclarationId(516),
+                        ty: DeclarationId(518),
                     },
                 ],
             },
@@ -11426,25 +11460,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16668, 16711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(180),
+            id: DeclarationId(182),
             name: Some("TopologyNodeKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(517),
+                        ty: DeclarationId(519),
                     },
                     Field {
                         label: "Transport".to_string(),
-                        ty: DeclarationId(518),
+                        ty: DeclarationId(520),
                     },
                     Field {
                         label: "SubDag".to_string(),
-                        ty: DeclarationId(519),
+                        ty: DeclarationId(521),
                     },
                     Field {
                         label: "Env".to_string(),
-                        ty: DeclarationId(520),
+                        ty: DeclarationId(522),
                     },
                 ],
             },
@@ -11459,21 +11493,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16839, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(181),
+            id: DeclarationId(183),
             name: Some("DocSourceKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Template".to_string(),
-                        ty: DeclarationId(521),
+                        ty: DeclarationId(523),
                     },
                     Field {
                         label: "Generated".to_string(),
-                        ty: DeclarationId(522),
+                        ty: DeclarationId(524),
                     },
                     Field {
                         label: "Static".to_string(),
-                        ty: DeclarationId(523),
+                        ty: DeclarationId(525),
                     },
                 ],
             },
@@ -11488,29 +11522,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16895, 16948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(182),
+            id: DeclarationId(184),
             name: Some("FermiDepth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Xs".to_string(),
-                        ty: DeclarationId(524),
+                        ty: DeclarationId(526),
                     },
                     Field {
                         label: "S".to_string(),
-                        ty: DeclarationId(525),
+                        ty: DeclarationId(527),
                     },
                     Field {
                         label: "M".to_string(),
-                        ty: DeclarationId(526),
+                        ty: DeclarationId(528),
                     },
                     Field {
                         label: "L".to_string(),
-                        ty: DeclarationId(527),
+                        ty: DeclarationId(529),
                     },
                     Field {
                         label: "Xl".to_string(),
-                        ty: DeclarationId(528),
+                        ty: DeclarationId(530),
                     },
                 ],
             },
@@ -11525,29 +11559,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16950, 16987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(183),
+            id: DeclarationId(185),
             name: Some("CredentialFlow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Stored".to_string(),
-                        ty: DeclarationId(529),
+                        ty: DeclarationId(531),
                     },
                     Field {
                         label: "PlatformInjected".to_string(),
-                        ty: DeclarationId(530),
+                        ty: DeclarationId(532),
                     },
                     Field {
                         label: "WorkloadIdentity".to_string(),
-                        ty: DeclarationId(533),
+                        ty: DeclarationId(535),
                     },
                     Field {
                         label: "InteractiveAuth".to_string(),
-                        ty: DeclarationId(535),
+                        ty: DeclarationId(537),
                     },
                     Field {
                         label: "Chained".to_string(),
-                        ty: DeclarationId(537),
+                        ty: DeclarationId(539),
                     },
                 ],
             },
@@ -11562,53 +11596,53 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17235, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(184),
+            id: DeclarationId(186),
             name: Some("Arch".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "X86_64".to_string(),
-                        ty: DeclarationId(538),
+                        ty: DeclarationId(540),
                     },
                     Field {
                         label: "X86".to_string(),
-                        ty: DeclarationId(539),
+                        ty: DeclarationId(541),
                     },
                     Field {
                         label: "Aarch64".to_string(),
-                        ty: DeclarationId(540),
+                        ty: DeclarationId(542),
                     },
                     Field {
                         label: "Arm".to_string(),
-                        ty: DeclarationId(541),
+                        ty: DeclarationId(543),
                     },
                     Field {
                         label: "Armv7".to_string(),
-                        ty: DeclarationId(542),
+                        ty: DeclarationId(544),
                     },
                     Field {
                         label: "Mips".to_string(),
-                        ty: DeclarationId(543),
+                        ty: DeclarationId(545),
                     },
                     Field {
                         label: "Mipsel".to_string(),
-                        ty: DeclarationId(544),
+                        ty: DeclarationId(546),
                     },
                     Field {
                         label: "Mips64".to_string(),
-                        ty: DeclarationId(545),
+                        ty: DeclarationId(547),
                     },
                     Field {
                         label: "Mips64el".to_string(),
-                        ty: DeclarationId(546),
+                        ty: DeclarationId(548),
                     },
                     Field {
                         label: "Riscv64".to_string(),
-                        ty: DeclarationId(547),
+                        ty: DeclarationId(549),
                     },
                     Field {
                         label: "Wasm32".to_string(),
-                        ty: DeclarationId(548),
+                        ty: DeclarationId(550),
                     },
                 ],
             },
@@ -11623,25 +11657,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17632, 17735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(185),
+            id: DeclarationId(187),
             name: Some("Vendor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnknownVendor".to_string(),
-                        ty: DeclarationId(549),
+                        ty: DeclarationId(551),
                     },
                     Field {
                         label: "Pc".to_string(),
-                        ty: DeclarationId(550),
+                        ty: DeclarationId(552),
                     },
                     Field {
                         label: "Apple".to_string(),
-                        ty: DeclarationId(551),
+                        ty: DeclarationId(553),
                     },
                     Field {
                         label: "W64".to_string(),
-                        ty: DeclarationId(552),
+                        ty: DeclarationId(554),
                     },
                 ],
             },
@@ -11656,37 +11690,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17736, 17782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(186),
+            id: DeclarationId(188),
             name: Some("Os".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Linux".to_string(),
-                        ty: DeclarationId(553),
+                        ty: DeclarationId(555),
                     },
                     Field {
                         label: "Macos".to_string(),
-                        ty: DeclarationId(554),
+                        ty: DeclarationId(556),
                     },
                     Field {
                         label: "Windows".to_string(),
-                        ty: DeclarationId(555),
+                        ty: DeclarationId(557),
                     },
                     Field {
                         label: "Freebsd".to_string(),
-                        ty: DeclarationId(556),
+                        ty: DeclarationId(558),
                     },
                     Field {
                         label: "Android".to_string(),
-                        ty: DeclarationId(557),
+                        ty: DeclarationId(559),
                     },
                     Field {
                         label: "Ios".to_string(),
-                        ty: DeclarationId(558),
+                        ty: DeclarationId(560),
                     },
                     Field {
                         label: "Wasi".to_string(),
-                        ty: DeclarationId(559),
+                        ty: DeclarationId(561),
                     },
                 ],
             },
@@ -11701,45 +11735,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17783, 17849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(187),
+            id: DeclarationId(189),
             name: Some("AbiEnv".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoneAbi".to_string(),
-                        ty: DeclarationId(560),
+                        ty: DeclarationId(562),
                     },
                     Field {
                         label: "Gnu".to_string(),
-                        ty: DeclarationId(561),
+                        ty: DeclarationId(563),
                     },
                     Field {
                         label: "GnuEabi".to_string(),
-                        ty: DeclarationId(562),
+                        ty: DeclarationId(564),
                     },
                     Field {
                         label: "GnuEabihf".to_string(),
-                        ty: DeclarationId(563),
+                        ty: DeclarationId(565),
                     },
                     Field {
                         label: "Musl".to_string(),
-                        ty: DeclarationId(564),
+                        ty: DeclarationId(566),
                     },
                     Field {
                         label: "Msvc".to_string(),
-                        ty: DeclarationId(565),
+                        ty: DeclarationId(567),
                     },
                     Field {
                         label: "AndroidAbi".to_string(),
-                        ty: DeclarationId(566),
+                        ty: DeclarationId(568),
                     },
                     Field {
                         label: "Eabi".to_string(),
-                        ty: DeclarationId(567),
+                        ty: DeclarationId(569),
                     },
                     Field {
                         label: "Eabihf".to_string(),
-                        ty: DeclarationId(568),
+                        ty: DeclarationId(570),
                     },
                 ],
             },
@@ -11754,29 +11788,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17850, 17942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(188),
+            id: DeclarationId(190),
             name: Some("ExecutionEnv".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Native".to_string(),
-                        ty: DeclarationId(569),
+                        ty: DeclarationId(571),
                     },
                     Field {
                         label: "Wsl".to_string(),
-                        ty: DeclarationId(570),
+                        ty: DeclarationId(572),
                     },
                     Field {
                         label: "Container".to_string(),
-                        ty: DeclarationId(571),
+                        ty: DeclarationId(573),
                     },
                     Field {
                         label: "Ci".to_string(),
-                        ty: DeclarationId(572),
+                        ty: DeclarationId(574),
                     },
                     Field {
                         label: "Emulator".to_string(),
-                        ty: DeclarationId(573),
+                        ty: DeclarationId(575),
                     },
                 ],
             },
@@ -11791,25 +11825,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17943, 18003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(189),
+            id: DeclarationId(191),
             name: Some("TargetTriple".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "arch".to_string(),
-                        ty: DeclarationId(184),
+                        ty: DeclarationId(186),
                     },
                     Field {
                         label: "vendor".to_string(),
-                        ty: DeclarationId(185),
+                        ty: DeclarationId(187),
                     },
                     Field {
                         label: "os".to_string(),
-                        ty: DeclarationId(186),
+                        ty: DeclarationId(188),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(574),
+                        ty: DeclarationId(576),
                     },
                 ],
             },
@@ -11824,17 +11858,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18005, 18080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(190),
+            id: DeclarationId(192),
             name: Some("RuntimePlatform".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "host".to_string(),
-                        ty: DeclarationId(189),
+                        ty: DeclarationId(191),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(188),
+                        ty: DeclarationId(190),
                     },
                 ],
             },
@@ -11849,29 +11883,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18082, 18147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(191),
+            id: DeclarationId(193),
             name: Some("EntryKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RegularFile".to_string(),
-                        ty: DeclarationId(575),
+                        ty: DeclarationId(577),
                     },
                     Field {
                         label: "Directory".to_string(),
-                        ty: DeclarationId(576),
+                        ty: DeclarationId(578),
                     },
                     Field {
                         label: "Symlink".to_string(),
-                        ty: DeclarationId(577),
+                        ty: DeclarationId(579),
                     },
                     Field {
                         label: "Missing".to_string(),
-                        ty: DeclarationId(578),
+                        ty: DeclarationId(580),
                     },
                     Field {
                         label: "Other".to_string(),
-                        ty: DeclarationId(579),
+                        ty: DeclarationId(581),
                     },
                 ],
             },
@@ -11886,21 +11920,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18456, 18534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(192),
+            id: DeclarationId(194),
             name: Some("SymlinkTarget".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TargetFile".to_string(),
-                        ty: DeclarationId(580),
+                        ty: DeclarationId(582),
                     },
                     Field {
                         label: "TargetDir".to_string(),
-                        ty: DeclarationId(581),
+                        ty: DeclarationId(583),
                     },
                     Field {
                         label: "Broken".to_string(),
-                        ty: DeclarationId(582),
+                        ty: DeclarationId(584),
                     },
                 ],
             },
@@ -11915,10 +11949,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18664, 18722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(193),
+            id: DeclarationId(195),
             name: Some("TextFilePath".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11932,10 +11966,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 19883, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(194),
+            id: DeclarationId(196),
             name: Some("BinaryFilePath".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11949,10 +11983,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 19994, 20024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(195),
+            id: DeclarationId(197),
             name: Some("MimeType".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11966,37 +12000,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 20241, 20263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(196),
+            id: DeclarationId(198),
             name: Some("HttpMethod".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GET".to_string(),
-                        ty: DeclarationId(583),
+                        ty: DeclarationId(585),
                     },
                     Field {
                         label: "POST".to_string(),
-                        ty: DeclarationId(584),
+                        ty: DeclarationId(586),
                     },
                     Field {
                         label: "PUT".to_string(),
-                        ty: DeclarationId(585),
+                        ty: DeclarationId(587),
                     },
                     Field {
                         label: "PATCH".to_string(),
-                        ty: DeclarationId(586),
+                        ty: DeclarationId(588),
                     },
                     Field {
                         label: "DELETE".to_string(),
-                        ty: DeclarationId(587),
+                        ty: DeclarationId(589),
                     },
                     Field {
                         label: "HEAD".to_string(),
-                        ty: DeclarationId(588),
+                        ty: DeclarationId(590),
                     },
                     Field {
                         label: "OPTIONS".to_string(),
-                        ty: DeclarationId(589),
+                        ty: DeclarationId(591),
                     },
                 ],
             },
@@ -12011,25 +12045,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21007, 21075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(197),
+            id: DeclarationId(199),
             name: Some("AuthScheme".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bearer".to_string(),
-                        ty: DeclarationId(590),
+                        ty: DeclarationId(592),
                     },
                     Field {
                         label: "Header".to_string(),
-                        ty: DeclarationId(591),
+                        ty: DeclarationId(593),
                     },
                     Field {
                         label: "Basic".to_string(),
-                        ty: DeclarationId(592),
+                        ty: DeclarationId(594),
                     },
                     Field {
                         label: "ApiKey".to_string(),
-                        ty: DeclarationId(593),
+                        ty: DeclarationId(595),
                     },
                 ],
             },
@@ -12044,21 +12078,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21543, 21639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(198),
+            id: DeclarationId(200),
             name: Some("AccessToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "token".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                     Field {
                         label: "scheme".to_string(),
-                        ty: DeclarationId(197),
+                        ty: DeclarationId(199),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(594),
+                        ty: DeclarationId(596),
                     },
                 ],
             },
@@ -12073,33 +12107,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21761, 21894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(199),
+            id: DeclarationId(201),
             name: Some("Credential".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "token".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                     Field {
                         label: "scheme".to_string(),
-                        ty: DeclarationId(197),
+                        ty: DeclarationId(199),
                     },
                     Field {
                         label: "header_name".to_string(),
-                        ty: DeclarationId(595),
+                        ty: DeclarationId(597),
                     },
                     Field {
                         label: "source_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "required_scopes".to_string(),
-                        ty: DeclarationId(596),
+                        ty: DeclarationId(598),
                     },
                     Field {
                         label: "expires_in".to_string(),
-                        ty: DeclarationId(597),
+                        ty: DeclarationId(599),
                     },
                 ],
             },
@@ -12114,67 +12148,67 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21896, 22046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(200),
+            id: DeclarationId(202),
             name: Some("FilesystemHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(156))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(158))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(651)),
+            refinement: Some(DeclarationId(653)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22123, 22187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(201),
+            id: DeclarationId(203),
             name: Some("NetworkHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(127))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(129))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(652)),
+            refinement: Some(DeclarationId(654)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22188, 22245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(202),
+            id: DeclarationId(204),
             name: Some("ToolHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(653)),
+            refinement: Some(DeclarationId(655)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22246, 22302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(203),
+            id: DeclarationId(205),
             name: Some("TransportRequest".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "method".to_string(),
-                        ty: DeclarationId(196),
+                        ty: DeclarationId(198),
                     },
                     Field {
                         label: "url".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12189,7 +12223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22379, 22470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(204),
+            id: DeclarationId(206),
             name: Some("TransportResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12199,11 +12233,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12218,21 +12252,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22472, 22543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(205),
+            id: DeclarationId(207),
             name: Some("FileResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "success".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12247,7 +12281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22545, 22615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(206),
+            id: DeclarationId(208),
             name: Some("ShellResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12257,11 +12291,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12276,7 +12310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22617, 22690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(207),
+            id: DeclarationId(209),
             name: Some("RestResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12286,11 +12320,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                 ],
             },
@@ -12305,29 +12339,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22692, 22756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(208),
+            id: DeclarationId(210),
             name: Some("TestResult".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ok".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "duration_ms".to_string(),
-                        ty: DeclarationId(161),
+                        ty: DeclarationId(163),
                     },
                 ],
             },
@@ -12342,7 +12376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22833, 22940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(209),
+            id: DeclarationId(211),
             name: Some("Summary".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12371,29 +12405,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22942, 22999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(210),
+            id: DeclarationId(212),
             name: Some("StageResult".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "success".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "skipped".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -12408,21 +12442,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23001, 23102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(211),
+            id: DeclarationId(213),
             name: Some("DocumentLine".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "is_comment".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "is_blank".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -12437,21 +12471,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23255, 23327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(212),
+            id: DeclarationId(214),
             name: Some("DocumentSection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "has_title".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "lines".to_string(),
-                        ty: DeclarationId(598),
+                        ty: DeclarationId(600),
                     },
                 ],
             },
@@ -12466,29 +12500,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23329, 23415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(213),
+            id: DeclarationId(215),
             name: Some("Document".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "header".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "has_header".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "comment_prefix".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "sections".to_string(),
-                        ty: DeclarationId(599),
+                        ty: DeclarationId(601),
                     },
                     Field {
                         label: "trailing_newline".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -12503,17 +12537,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23417, 23554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(214),
+            id: DeclarationId(216),
             name: Some("TextFile".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document".to_string(),
-                        ty: DeclarationId(213),
+                        ty: DeclarationId(215),
                     },
                 ],
             },
@@ -12528,17 +12562,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23556, 23609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(215),
+            id: DeclarationId(217),
             name: Some("RenderedTextFile".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12553,21 +12587,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23611, 23669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(216),
+            id: DeclarationId(218),
             name: Some("ToolEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(600),
+                        ty: DeclarationId(602),
                     },
                 ],
             },
@@ -12582,12 +12616,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23746, 23820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(217),
+            id: DeclarationId(219),
             name: Some("ToolRegistry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tools".to_string(),
-                    ty: DeclarationId(601),
+                    ty: DeclarationId(603),
                 }],
             },
             type_params: vec![],
@@ -12601,21 +12635,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23822, 23868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(218),
+            id: DeclarationId(220),
             name: Some("DagTopology".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(602),
+                        ty: DeclarationId(604),
                     },
                     Field {
                         label: "edges".to_string(),
-                        ty: DeclarationId(603),
+                        ty: DeclarationId(605),
                     },
                     Field {
                         label: "subdag_boundaries".to_string(),
-                        ty: DeclarationId(604),
+                        ty: DeclarationId(606),
                     },
                 ],
             },
@@ -12630,25 +12664,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24127, 24237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(219),
+            id: DeclarationId(221),
             name: Some("TopologyNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(180),
+                        ty: DeclarationId(182),
                     },
                     Field {
                         label: "parent".to_string(),
-                        ty: DeclarationId(605),
+                        ty: DeclarationId(607),
                     },
                 ],
             },
@@ -12663,21 +12697,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24239, 24359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(220),
+            id: DeclarationId(222),
             name: Some("TopologyEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "from".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "to".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "port".to_string(),
-                        ty: DeclarationId(606),
+                        ty: DeclarationId(608),
                     },
                 ],
             },
@@ -12692,21 +12726,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24361, 24426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(221),
+            id: DeclarationId(223),
             name: Some("DagDiff".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "added".to_string(),
-                        ty: DeclarationId(607),
+                        ty: DeclarationId(609),
                     },
                     Field {
                         label: "removed".to_string(),
-                        ty: DeclarationId(608),
+                        ty: DeclarationId(610),
                     },
                     Field {
                         label: "changed".to_string(),
-                        ty: DeclarationId(609),
+                        ty: DeclarationId(611),
                     },
                 ],
             },
@@ -12721,29 +12755,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24428, 24514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(222),
+            id: DeclarationId(224),
             name: Some("CodegenTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "backend".to_string(),
-                        ty: DeclarationId(610),
+                        ty: DeclarationId(612),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(611),
+                        ty: DeclarationId(613),
                     },
                     Field {
                         label: "runtime_env".to_string(),
-                        ty: DeclarationId(612),
+                        ty: DeclarationId(614),
                     },
                 ],
             },
@@ -12758,25 +12792,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24583, 24717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(223),
+            id: DeclarationId(225),
             name: Some("CodegenBackend".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Rust".to_string(),
-                        ty: DeclarationId(613),
+                        ty: DeclarationId(615),
                     },
                     Field {
                         label: "Go".to_string(),
-                        ty: DeclarationId(614),
+                        ty: DeclarationId(616),
                     },
                     Field {
                         label: "C".to_string(),
-                        ty: DeclarationId(615),
+                        ty: DeclarationId(617),
                     },
                     Field {
                         label: "Mips".to_string(),
-                        ty: DeclarationId(616),
+                        ty: DeclarationId(618),
                     },
                 ],
             },
@@ -12791,21 +12825,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24719, 24761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(224),
+            id: DeclarationId(226),
             name: Some("PragmaDirective".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "key".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(617),
+                        ty: DeclarationId(619),
                     },
                 ],
             },
@@ -12820,17 +12854,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24763, 24834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(225),
+            id: DeclarationId(227),
             name: Some("DocSource".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(181),
+                        ty: DeclarationId(183),
                     },
                 ],
             },
@@ -12845,10 +12879,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24975, 25032),
         });
         declarations.push(Declaration {
-            id: DeclarationId(226),
+            id: DeclarationId(228),
             name: Some("ReferenceModel".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
-            type_params: vec![DeclarationId(227)],
+            type_params: vec![DeclarationId(229)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -12859,7 +12893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 26966, 26985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(227),
+            id: DeclarationId(229),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -12873,13 +12907,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 26966, 26985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(228),
+            id: DeclarationId(230),
             name: Some("String".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(130),
+                    value: DeclarationId(132),
                 }],
             },
             type_params: vec![],
@@ -12893,25 +12927,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/string_type.dag", 520, 550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(229),
+            id: DeclarationId(231),
             name: Some("CharClass".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Whitespace".to_string(),
-                        ty: DeclarationId(654),
+                        ty: DeclarationId(656),
                     },
                     Field {
                         label: "Digit".to_string(),
-                        ty: DeclarationId(655),
+                        ty: DeclarationId(657),
                     },
                     Field {
                         label: "IdentStart".to_string(),
-                        ty: DeclarationId(656),
+                        ty: DeclarationId(658),
                     },
                     Field {
                         label: "IdentContinue".to_string(),
-                        ty: DeclarationId(657),
+                        ty: DeclarationId(659),
                     },
                 ],
             },
@@ -12926,11 +12960,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3662, 3726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(230),
+            id: DeclarationId(232),
             name: Some("char_in_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130), DeclarationId(229)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(132), DeclarationId(231)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 3780, 4378)),
             },
             type_params: vec![],
@@ -12944,21 +12978,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3728, 4378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(231),
+            id: DeclarationId(233),
             name: Some("DisplayWidth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(658),
+                        ty: DeclarationId(660),
                     },
                     Field {
                         label: "Narrow".to_string(),
-                        ty: DeclarationId(659),
+                        ty: DeclarationId(661),
                     },
                     Field {
                         label: "Wide".to_string(),
-                        ty: DeclarationId(660),
+                        ty: DeclarationId(662),
                     },
                 ],
             },
@@ -12973,10 +13007,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4742, 4787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(232),
+            id: DeclarationId(234),
             name: Some("display_width_columns".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(231)],
+                inputs: vec![DeclarationId(233)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 4838, 4914)),
             },
@@ -12991,13 +13025,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4789, 4914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(233),
+            id: DeclarationId(235),
             name: Some("UnicodeBlock".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "start".to_string(),
@@ -13009,7 +13043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "default_width".to_string(),
-                        ty: DeclarationId(231),
+                        ty: DeclarationId(233),
                     },
                 ],
             },
@@ -13024,18 +13058,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 5149, 5249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(234),
+            id: DeclarationId(236),
             name: Some("zero_width_blocks".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(661)),
+            meta_tag: Some(DeclarationId(663)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -13057,7 +13091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13080,7 +13114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13103,7 +13137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13126,7 +13160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13147,7 +13181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13170,7 +13204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13181,18 +13215,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 5311, 6060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(235),
+            id: DeclarationId(237),
             name: Some("zero_width_codepoints".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(662)),
+            meta_tag: Some(DeclarationId(664)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -13206,18 +13240,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6127, 6339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(236),
+            id: DeclarationId(238),
             name: Some("wide_blocks".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(663)),
+            meta_tag: Some(DeclarationId(665)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -13237,7 +13271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13260,7 +13294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13283,7 +13317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13304,7 +13338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13327,7 +13361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13350,7 +13384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13371,7 +13405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13394,7 +13428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13417,7 +13451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13438,7 +13472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13459,7 +13493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13480,7 +13514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13501,7 +13535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13524,7 +13558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13547,7 +13581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13568,7 +13602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13579,10 +13613,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6386, 8175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(237),
+            id: DeclarationId(239),
             name: Some("code_point".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
+                inputs: vec![DeclarationId(132)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8355, 8366)),
             },
@@ -13597,11 +13631,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8325, 8366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(238),
+            id: DeclarationId(240),
             name: Some("in_block".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(233)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(93), DeclarationId(235)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8418, 8470)),
             },
             type_params: vec![],
@@ -13615,11 +13649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8368, 8470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(239),
+            id: DeclarationId(241),
             name: Some("char_display_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
-                output: DeclarationId(231),
+                inputs: vec![DeclarationId(132)],
+                output: DeclarationId(233),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8519, 8822)),
             },
             type_params: vec![],
@@ -13633,10 +13667,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8472, 8822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(240),
+            id: DeclarationId(242),
             name: Some("char_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
+                inputs: vec![DeclarationId(132)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8854, 8910)),
             },
@@ -13651,10 +13685,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8824, 8910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(241),
+            id: DeclarationId(243),
             name: Some("string_display_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
+                inputs: vec![DeclarationId(230)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8954, 9092)),
             },
@@ -13669,11 +13703,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8912, 9092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(242),
+            id: DeclarationId(244),
             name: Some("repeat_string_loop".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/std/render_repeat_string_bootstrap.dag",
                     598,
@@ -13691,11 +13725,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/render_repeat_string_bootstrap.dag", 526, 717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(243),
+            id: DeclarationId(245),
             name: Some("repeat_string".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/std/render_repeat_string_bootstrap.dag",
                     765,
@@ -13713,12 +13747,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/render_repeat_string_bootstrap.dag", 719, 818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(244),
+            id: DeclarationId(246),
             name: Some("MethodDeclaration".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -13732,15 +13766,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 4779, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(245),
+            id: DeclarationId(247),
             name: Some("add_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13754,15 +13788,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5269, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(246),
+            id: DeclarationId(248),
             name: Some("all_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13776,15 +13810,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5322, 5374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(247),
+            id: DeclarationId(249),
             name: Some("any_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13798,15 +13832,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5375, 5427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(248),
+            id: DeclarationId(250),
             name: Some("append_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13820,15 +13854,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5428, 5486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(249),
+            id: DeclarationId(251),
             name: Some("bottom_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13842,15 +13876,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5487, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(250),
+            id: DeclarationId(252),
             name: Some("chars_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13864,15 +13898,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5546, 5602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(251),
+            id: DeclarationId(253),
             name: Some("clamp_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13886,15 +13920,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5603, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(252),
+            id: DeclarationId(254),
             name: Some("compare_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13908,15 +13942,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5660, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(253),
+            id: DeclarationId(255),
             name: Some("complement_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13930,15 +13964,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5721, 5787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(254),
+            id: DeclarationId(256),
             name: Some("concat_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13952,15 +13986,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5788, 5846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(255),
+            id: DeclarationId(257),
             name: Some("contains_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13974,15 +14008,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5847, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(256),
+            id: DeclarationId(258),
             name: Some("count_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13996,15 +14030,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5910, 5966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(257),
+            id: DeclarationId(259),
             name: Some("diff_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14018,15 +14052,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5967, 6021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(258),
+            id: DeclarationId(260),
             name: Some("empty_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14040,15 +14074,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6022, 6078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(259),
+            id: DeclarationId(261),
             name: Some("ends_with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14062,15 +14096,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6079, 6143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(260),
+            id: DeclarationId(262),
             name: Some("enumerate_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14084,15 +14118,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6144, 6208),
         });
         declarations.push(Declaration {
-            id: DeclarationId(261),
+            id: DeclarationId(263),
             name: Some("filter_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14106,15 +14140,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6209, 6267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(262),
+            id: DeclarationId(264),
             name: Some("first_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14128,15 +14162,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6268, 6324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(263),
+            id: DeclarationId(265),
             name: Some("flat_map_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14150,15 +14184,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6325, 6387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(264),
+            id: DeclarationId(266),
             name: Some("fold_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14172,15 +14206,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6388, 6442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(265),
+            id: DeclarationId(267),
             name: Some("get_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14194,15 +14228,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6443, 6495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(266),
+            id: DeclarationId(268),
             name: Some("has_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14216,15 +14250,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6496, 6548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(267),
+            id: DeclarationId(269),
             name: Some("intersect_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14238,15 +14272,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6549, 6613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(268),
+            id: DeclarationId(270),
             name: Some("is_empty_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14260,15 +14294,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6614, 6676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(269),
+            id: DeclarationId(271),
             name: Some("join_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14282,15 +14316,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6677, 6731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(270),
+            id: DeclarationId(272),
             name: Some("keys_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14304,15 +14338,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6732, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(271),
+            id: DeclarationId(273),
             name: Some("last_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14326,15 +14360,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6787, 6841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(272),
+            id: DeclarationId(274),
             name: Some("length_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14348,15 +14382,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6842, 6900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(273),
+            id: DeclarationId(275),
             name: Some("list_push_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14370,15 +14404,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6901, 6965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(274),
+            id: DeclarationId(276),
             name: Some("lookup_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14392,15 +14426,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6966, 7024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(275),
+            id: DeclarationId(277),
             name: Some("map_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14414,15 +14448,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7025, 7077),
         });
         declarations.push(Declaration {
-            id: DeclarationId(276),
+            id: DeclarationId(278),
             name: Some("map_contains_key_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14436,15 +14470,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7078, 7156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(277),
+            id: DeclarationId(279),
             name: Some("map_get_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14458,15 +14492,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7157, 7217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(278),
+            id: DeclarationId(280),
             name: Some("map_has_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14480,15 +14514,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7218, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(279),
+            id: DeclarationId(281),
             name: Some("map_insert_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14502,15 +14536,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7279, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(280),
+            id: DeclarationId(282),
             name: Some("map_keys_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14524,15 +14558,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7346, 7408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(281),
+            id: DeclarationId(283),
             name: Some("map_merge_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14546,15 +14580,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7409, 7473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(282),
+            id: DeclarationId(284),
             name: Some("map_values_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14568,15 +14602,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7474, 7540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(283),
+            id: DeclarationId(285),
             name: Some("meet_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14590,15 +14624,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7541, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(284),
+            id: DeclarationId(286),
             name: Some("member_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14612,15 +14646,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7596, 7654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(285),
+            id: DeclarationId(287),
             name: Some("mul_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14634,15 +14668,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7655, 7707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(286),
+            id: DeclarationId(288),
             name: Some("negate_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14656,15 +14690,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7708, 7766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(287),
+            id: DeclarationId(289),
             name: Some("one_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14678,15 +14712,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7767, 7819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(288),
+            id: DeclarationId(290),
             name: Some("reciprocal_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14700,15 +14734,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7820, 7886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(289),
+            id: DeclarationId(291),
             name: Some("replace_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14722,15 +14756,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7887, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(290),
+            id: DeclarationId(292),
             name: Some("reverse_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14744,15 +14778,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7948, 8008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(291),
+            id: DeclarationId(293),
             name: Some("skip_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14766,15 +14800,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8009, 8063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(292),
+            id: DeclarationId(294),
             name: Some("sort_by_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14788,15 +14822,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8064, 8124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(293),
+            id: DeclarationId(295),
             name: Some("split_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14810,15 +14844,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8125, 8181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(294),
+            id: DeclarationId(296),
             name: Some("starts_with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14832,15 +14866,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8182, 8250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(295),
+            id: DeclarationId(297),
             name: Some("string_contains_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14854,15 +14888,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8251, 8327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(296),
+            id: DeclarationId(298),
             name: Some("substring_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14876,15 +14910,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8328, 8392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(297),
+            id: DeclarationId(299),
             name: Some("take_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14898,15 +14932,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8393, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(298),
+            id: DeclarationId(300),
             name: Some("to_int_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14920,15 +14954,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8448, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(299),
+            id: DeclarationId(301),
             name: Some("to_lower_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14942,15 +14976,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8507, 8569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(300),
+            id: DeclarationId(302),
             name: Some("to_string_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14964,15 +14998,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8570, 8634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(301),
+            id: DeclarationId(303),
             name: Some("to_upper_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14986,15 +15020,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8635, 8697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(302),
+            id: DeclarationId(304),
             name: Some("top_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15008,15 +15042,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8698, 8750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(303),
+            id: DeclarationId(305),
             name: Some("trim_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15030,15 +15064,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8751, 8805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(304),
+            id: DeclarationId(306),
             name: Some("union_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15052,15 +15086,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8806, 8862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(305),
+            id: DeclarationId(307),
             name: Some("values_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15074,15 +15108,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8863, 8921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(306),
+            id: DeclarationId(308),
             name: Some("with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15096,15 +15130,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8922, 8976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(307),
+            id: DeclarationId(309),
             name: Some("zero_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15118,7 +15152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8977, 9031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(308),
+            id: DeclarationId(310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15132,7 +15166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/logic.dag", 304, 308),
         });
         declarations.push(Declaration {
-            id: DeclarationId(309),
+            id: DeclarationId(311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15146,12 +15180,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/logic.dag", 311, 316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(310),
+            id: DeclarationId(312),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(4),
                 }],
             },
@@ -15166,12 +15200,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1023, 1032),
         });
         declarations.push(Declaration {
-            id: DeclarationId(311),
+            id: DeclarationId(313),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(4),
                 }],
             },
@@ -15186,12 +15220,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1136, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(312),
+            id: DeclarationId(314),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15206,12 +15240,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1272, 1282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(313),
+            id: DeclarationId(315),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15226,12 +15260,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1306, 1316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(314),
+            id: DeclarationId(316),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15246,12 +15280,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1340, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(315),
+            id: DeclarationId(317),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15266,7 +15300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1375, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(316),
+            id: DeclarationId(318),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -15285,7 +15319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 620, 636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(317),
+            id: DeclarationId(319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -15304,7 +15338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 639, 657),
         });
         declarations.push(Declaration {
-            id: DeclarationId(318),
+            id: DeclarationId(320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15318,7 +15352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 936, 948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(319),
+            id: DeclarationId(321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15332,12 +15366,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 951, 959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(320),
+            id: DeclarationId(322),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15352,12 +15386,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 24186, 24212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(321),
+            id: DeclarationId(323),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15372,12 +15406,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 25393, 25419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(322),
+            id: DeclarationId(324),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15392,12 +15426,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 26550, 26576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(323),
+            id: DeclarationId(325),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15412,12 +15446,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 27676, 27702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(324),
+            id: DeclarationId(326),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15432,12 +15466,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 31087, 31113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(325),
+            id: DeclarationId(327),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15452,12 +15486,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 34394, 34420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(326),
+            id: DeclarationId(328),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15472,12 +15506,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 39723, 39749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(327),
+            id: DeclarationId(329),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15492,13 +15526,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 42637, 42663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(328),
+            id: DeclarationId(330),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -15512,7 +15546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 43456, 43468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(329),
+            id: DeclarationId(331),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(16), DeclarationId(16)],
@@ -15530,7 +15564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 4724, 4737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(330),
+            id: DeclarationId(332),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(18), DeclarationId(18)],
@@ -15548,7 +15582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 4843, 4856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(331),
+            id: DeclarationId(333),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(20), DeclarationId(20)],
@@ -15566,7 +15600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5060, 5073),
         });
         declarations.push(Declaration {
-            id: DeclarationId(332),
+            id: DeclarationId(334),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(22), DeclarationId(22)],
@@ -15584,7 +15618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5182, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(333),
+            id: DeclarationId(335),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(24), DeclarationId(24)],
@@ -15602,7 +15636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5333, 5346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(334),
+            id: DeclarationId(336),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(24)],
@@ -15620,7 +15654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(335),
+            id: DeclarationId(337),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(26), DeclarationId(26)],
@@ -15638,7 +15672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5451, 5464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(336),
+            id: DeclarationId(338),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(26)],
@@ -15656,7 +15690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5490, 5500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(337),
+            id: DeclarationId(339),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(32), DeclarationId(32)],
@@ -15674,7 +15708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 10528, 10541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(338),
+            id: DeclarationId(340),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(32), DeclarationId(32)],
@@ -15692,7 +15726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 10559, 10572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(339),
+            id: DeclarationId(341),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(34), DeclarationId(34)],
@@ -15710,7 +15744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11014, 11027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(340),
+            id: DeclarationId(342),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(34), DeclarationId(34)],
@@ -15728,7 +15762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11045, 11058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(341),
+            id: DeclarationId(343),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36), DeclarationId(36)],
@@ -15746,7 +15780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11218, 11231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(342),
+            id: DeclarationId(344),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36)],
@@ -15764,7 +15798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11252, 11262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(343),
+            id: DeclarationId(345),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36), DeclarationId(36)],
@@ -15782,7 +15816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11270, 11283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(344),
+            id: DeclarationId(346),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15800,7 +15834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12084, 12097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(345),
+            id: DeclarationId(347),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15818,7 +15852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12105, 12118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(346),
+            id: DeclarationId(348),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38)],
@@ -15836,7 +15870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12139, 12149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(347),
+            id: DeclarationId(349),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15854,7 +15888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12157, 12170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(348),
+            id: DeclarationId(350),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -15880,11 +15914,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12190, 12209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(349),
+            id: DeclarationId(351),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(348),
+                output: DeclarationId(350),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15898,7 +15932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12178, 12209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(350),
+            id: DeclarationId(352),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15916,11 +15950,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12230, 12250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(351),
+            id: DeclarationId(353),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15934,11 +15968,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12257, 12273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(352),
+            id: DeclarationId(354),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15952,11 +15986,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12280, 12296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(353),
+            id: DeclarationId(355),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15970,11 +16004,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12303, 12319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(354),
+            id: DeclarationId(356),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15988,11 +16022,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12326, 12342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(355),
+            id: DeclarationId(357),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16006,11 +16040,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12349, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(356),
+            id: DeclarationId(358),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16024,7 +16058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12372, 12388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(357),
+            id: DeclarationId(359),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -16042,7 +16076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12551, 12564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(358),
+            id: DeclarationId(360),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40)],
@@ -16060,7 +16094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12585, 12595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(359),
+            id: DeclarationId(361),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -16078,7 +16112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12603, 12616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(360),
+            id: DeclarationId(362),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40)],
@@ -16096,7 +16130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12640, 12650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(361),
+            id: DeclarationId(363),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -16114,7 +16148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12662, 12682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(362),
+            id: DeclarationId(364),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(42), DeclarationId(42)],
@@ -16132,7 +16166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13030, 13043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(363),
+            id: DeclarationId(365),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(42), DeclarationId(42)],
@@ -16150,7 +16184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13052, 13065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(364),
+            id: DeclarationId(366),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(44), DeclarationId(44)],
@@ -16168,7 +16202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13208, 13221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(365),
+            id: DeclarationId(367),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(44), DeclarationId(44)],
@@ -16186,7 +16220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13230, 13243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(366),
+            id: DeclarationId(368),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46), DeclarationId(46)],
@@ -16204,7 +16238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13497, 13510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(367),
+            id: DeclarationId(369),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46), DeclarationId(46)],
@@ -16222,7 +16256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13519, 13532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(368),
+            id: DeclarationId(370),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46)],
@@ -16240,7 +16274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13547, 13557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(369),
+            id: DeclarationId(371),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16260,7 +16294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17529, 17542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(370),
+            id: DeclarationId(372),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16280,7 +16314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17544, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(371),
+            id: DeclarationId(373),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16300,11 +16334,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17562, 17575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(372),
+            id: DeclarationId(374),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(369), DeclarationId(370)],
-                output: DeclarationId(371),
+                inputs: vec![DeclarationId(371), DeclarationId(372)],
+                output: DeclarationId(373),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16318,7 +16352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17526, 17575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(373),
+            id: DeclarationId(375),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16338,7 +16372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17585, 17598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(374),
+            id: DeclarationId(376),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16358,11 +16392,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17618, 17631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(375),
+            id: DeclarationId(377),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(374),
+                output: DeclarationId(376),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16376,7 +16410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17609, 17631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(376),
+            id: DeclarationId(378),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16396,11 +16430,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17733, 17746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(377),
+            id: DeclarationId(379),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(376),
+                output: DeclarationId(378),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16414,7 +16448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17717, 17746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(378),
+            id: DeclarationId(380),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -16432,11 +16466,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17757, 17768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(379),
+            id: DeclarationId(381),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16450,7 +16484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17781, 17793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(380),
+            id: DeclarationId(382),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -16468,7 +16502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17803, 17814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(381),
+            id: DeclarationId(383),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -16487,11 +16521,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(382),
+            id: DeclarationId(384),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(381),
+                output: DeclarationId(383),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16505,7 +16539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17824, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(383),
+            id: DeclarationId(385),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -16524,11 +16558,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(384),
+            id: DeclarationId(386),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(383),
+                output: DeclarationId(385),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16542,7 +16576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17843, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(385),
+            id: DeclarationId(387),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
@@ -16560,7 +16594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17951, 17961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(386),
+            id: DeclarationId(388),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16580,11 +16614,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17966, 17979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(387),
+            id: DeclarationId(389),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(385)],
-                output: DeclarationId(386),
+                inputs: vec![DeclarationId(387)],
+                output: DeclarationId(388),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16598,11 +16632,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17948, 17979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(388),
+            id: DeclarationId(390),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16616,7 +16650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17993, 18006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(389),
+            id: DeclarationId(391),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16636,11 +16670,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18011, 18024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(390),
+            id: DeclarationId(392),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(388)],
-                output: DeclarationId(389),
+                inputs: vec![DeclarationId(390)],
+                output: DeclarationId(391),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16654,7 +16688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17990, 18024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(391),
+            id: DeclarationId(393),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48), DeclarationId(48)],
@@ -16672,10 +16706,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18039, 18052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(392),
+            id: DeclarationId(394),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(48), DeclarationId(391)],
+                inputs: vec![DeclarationId(48), DeclarationId(393)],
                 output: DeclarationId(48),
                 body: ArrowBody::NoBody,
             },
@@ -16690,7 +16724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18033, 18058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(393),
+            id: DeclarationId(395),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16710,11 +16744,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18083, 18096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(394),
+            id: DeclarationId(396),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(393),
+                output: DeclarationId(395),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16728,7 +16762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18074, 18096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(395),
+            id: DeclarationId(397),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16748,11 +16782,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18101, 18114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(396),
+            id: DeclarationId(398),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(394)],
-                output: DeclarationId(395),
+                inputs: vec![DeclarationId(396)],
+                output: DeclarationId(397),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16766,11 +16800,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18071, 18114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(397),
+            id: DeclarationId(399),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16784,11 +16818,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18125, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(398),
+            id: DeclarationId(400),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(397)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(399)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16802,11 +16836,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18122, 18147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(399),
+            id: DeclarationId(401),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16820,11 +16854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18158, 18171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(400),
+            id: DeclarationId(402),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(399)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(401)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16838,7 +16872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18155, 18180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(401),
+            id: DeclarationId(403),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::UnresolvedIdentifier(
                 "Tuple".to_string(),
@@ -16854,10 +16888,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18245, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(402),
+            id: DeclarationId(404),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(401),
+                template: DeclarationId(403),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -16871,13 +16905,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18245, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(403),
+            id: DeclarationId(405),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(402),
+                    value: DeclarationId(404),
                 }],
             },
             type_params: vec![],
@@ -16891,11 +16925,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18234, 18259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(404),
+            id: DeclarationId(406),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(403),
+                output: DeclarationId(405),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16909,7 +16943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18226, 18259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(405),
+            id: DeclarationId(407),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16929,11 +16963,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18279, 18292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(406),
+            id: DeclarationId(408),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(405),
+                output: DeclarationId(407),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16947,7 +16981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18271, 18292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(407),
+            id: DeclarationId(409),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16967,11 +17001,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18312, 18325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(408),
+            id: DeclarationId(410),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(407),
+                output: DeclarationId(409),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16985,7 +17019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18301, 18325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(409),
+            id: DeclarationId(411),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17005,11 +17039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18345, 18358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(410),
+            id: DeclarationId(412),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(409),
+                output: DeclarationId(411),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17023,7 +17057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18334, 18358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(411),
+            id: DeclarationId(413),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48), DeclarationId(48)],
@@ -17041,7 +17075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18373, 18388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(412),
+            id: DeclarationId(414),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17061,11 +17095,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18393, 18406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(413),
+            id: DeclarationId(415),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(411)],
-                output: DeclarationId(412),
+                inputs: vec![DeclarationId(413)],
+                output: DeclarationId(414),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17079,11 +17113,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18370, 18406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(414),
+            id: DeclarationId(416),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17097,7 +17131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18419, 18432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(415),
+            id: DeclarationId(417),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17116,11 +17150,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(416),
+            id: DeclarationId(418),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(415),
+                output: DeclarationId(417),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17134,7 +17168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18988, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(417),
+            id: DeclarationId(419),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17160,7 +17194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19009, 19030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(418),
+            id: DeclarationId(420),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17179,11 +17213,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(419),
+            id: DeclarationId(421),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(418),
+                output: DeclarationId(420),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17197,7 +17231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19038, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(420),
+            id: DeclarationId(422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17223,11 +17257,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19072, 19093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(421),
+            id: DeclarationId(423),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50), DeclarationId(51)],
-                output: DeclarationId(420),
+                output: DeclarationId(422),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17241,7 +17275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19060, 19093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(422),
+            id: DeclarationId(424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17267,7 +17301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19106, 19127),
         });
         declarations.push(Declaration {
-            id: DeclarationId(423),
+            id: DeclarationId(425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17293,11 +17327,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19132, 19153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(424),
+            id: DeclarationId(426),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(422)],
-                output: DeclarationId(423),
+                inputs: vec![DeclarationId(424)],
+                output: DeclarationId(425),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17311,7 +17345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19103, 19153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(425),
+            id: DeclarationId(427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17331,11 +17365,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19170, 19183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(426),
+            id: DeclarationId(428),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(425),
+                output: DeclarationId(427),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17349,7 +17383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19162, 19183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(427),
+            id: DeclarationId(429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17369,11 +17403,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19202, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(428),
+            id: DeclarationId(430),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(427),
+                output: DeclarationId(429),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17387,11 +17421,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19194, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(429),
+            id: DeclarationId(431),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17405,11 +17439,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19223, 19236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(430),
+            id: DeclarationId(432),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17423,7 +17457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19253, 19266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(431),
+            id: DeclarationId(433),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -17441,7 +17475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19275, 19286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(432),
+            id: DeclarationId(434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17455,7 +17489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19505, 19509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(433),
+            id: DeclarationId(435),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17469,7 +17503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19512, 19517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(434),
+            id: DeclarationId(436),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17483,7 +17517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19520, 19527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(435),
+            id: DeclarationId(437),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17497,7 +17531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21636, 21654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(436),
+            id: DeclarationId(438),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17511,7 +17545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21659, 21682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(437),
+            id: DeclarationId(439),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17525,7 +17559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21687, 21708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(438),
+            id: DeclarationId(440),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17539,7 +17573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21713, 21744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(439),
+            id: DeclarationId(441),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17553,7 +17587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21749, 21772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(440),
+            id: DeclarationId(442),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17567,7 +17601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21777, 21804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(441),
+            id: DeclarationId(443),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17581,7 +17615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21809, 21831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(442),
+            id: DeclarationId(444),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17595,12 +17629,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21858, 21872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(443),
+            id: DeclarationId(445),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -17614,7 +17648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21877, 21899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(444),
+            id: DeclarationId(446),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17628,7 +17662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21930, 21942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(445),
+            id: DeclarationId(447),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17642,7 +17676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21947, 21962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(446),
+            id: DeclarationId(448),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17656,7 +17690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21967, 21978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(447),
+            id: DeclarationId(449),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17670,12 +17704,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21983, 21996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(448),
+            id: DeclarationId(450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -17689,7 +17723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22001, 22031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(449),
+            id: DeclarationId(451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -17714,7 +17748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22036, 22105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(450),
+            id: DeclarationId(452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -17733,7 +17767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22110, 22151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(451),
+            id: DeclarationId(453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -17758,12 +17792,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22156, 22223),
         });
         declarations.push(Declaration {
-            id: DeclarationId(452),
+            id: DeclarationId(454),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(55),
                 }],
             },
@@ -17778,13 +17812,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22249, 22274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(453),
+            id: DeclarationId(455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(452),
+                        ty: DeclarationId(454),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -17803,12 +17837,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22228, 22310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(454),
+            id: DeclarationId(456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "id".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -17822,7 +17856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22315, 22349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(455),
+            id: DeclarationId(457),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17836,7 +17870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22595, 22607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(456),
+            id: DeclarationId(458),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17850,7 +17884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22665, 22681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(457),
+            id: DeclarationId(459),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17864,7 +17898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22728, 22742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(458),
+            id: DeclarationId(460),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17878,7 +17912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23219, 23232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(459),
+            id: DeclarationId(461),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17892,7 +17926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23248, 23263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(460),
+            id: DeclarationId(462),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17906,7 +17940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23309, 23325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(461),
+            id: DeclarationId(463),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17920,12 +17954,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23372, 23385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(462),
+            id: DeclarationId(464),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(55),
                 }],
             },
@@ -17940,7 +17974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23468, 23493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(463),
+            id: DeclarationId(465),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17959,7 +17993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(464),
+            id: DeclarationId(466),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17978,7 +18012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(465),
+            id: DeclarationId(467),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17997,17 +18031,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(466),
+            id: DeclarationId(468),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(53),
                     },
                 ],
@@ -18023,7 +18057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23872, 23899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(467),
+            id: DeclarationId(469),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18037,7 +18071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/machine_constraints.dag", 7335, 7342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(468),
+            id: DeclarationId(470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18057,7 +18091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2277, 2295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(469),
+            id: DeclarationId(471),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18077,7 +18111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2323, 2343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(470),
+            id: DeclarationId(472),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18097,7 +18131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2371, 2391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(471),
+            id: DeclarationId(473),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18117,7 +18151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2419, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(472),
+            id: DeclarationId(474),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18137,7 +18171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2468, 2489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(473),
+            id: DeclarationId(475),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18157,7 +18191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2583, 2601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(474),
+            id: DeclarationId(476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18177,7 +18211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2631, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(475),
+            id: DeclarationId(477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18197,7 +18231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2681, 2701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(476),
+            id: DeclarationId(478),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18217,7 +18251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2731, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(477),
+            id: DeclarationId(479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18237,7 +18271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2782, 2803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(478),
+            id: DeclarationId(480),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(27),
@@ -18257,7 +18291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 6254, 6274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(479),
+            id: DeclarationId(481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18277,7 +18311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 7962, 7988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(480),
+            id: DeclarationId(482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18297,11 +18331,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 8024, 8050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(481),
+            id: DeclarationId(483),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(76)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(2))),
             },
             type_params: vec![],
@@ -18315,7 +18349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 9551, 9558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(482),
+            id: DeclarationId(484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(29),
@@ -18335,7 +18369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/rational.dag", 1267, 1288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(483),
+            id: DeclarationId(485),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18349,7 +18383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1052, 1065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(484),
+            id: DeclarationId(486),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18363,7 +18397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1070, 1076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(485),
+            id: DeclarationId(487),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18377,7 +18411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1081, 1099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(486),
+            id: DeclarationId(488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18391,7 +18425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1104, 1122),
         });
         declarations.push(Declaration {
-            id: DeclarationId(487),
+            id: DeclarationId(489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18405,7 +18439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1127, 1141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(488),
+            id: DeclarationId(490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18419,7 +18453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1423, 1432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(489),
+            id: DeclarationId(491),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -18444,7 +18478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1437, 1514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(490),
+            id: DeclarationId(492),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -18469,7 +18503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1519, 1589),
         });
         declarations.push(Declaration {
-            id: DeclarationId(491),
+            id: DeclarationId(493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18483,7 +18517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1829, 1834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(492),
+            id: DeclarationId(494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18497,7 +18531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1837, 1845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(493),
+            id: DeclarationId(495),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18511,7 +18545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1848, 1868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(494),
+            id: DeclarationId(496),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18525,7 +18559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2118, 2128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(495),
+            id: DeclarationId(497),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18539,7 +18573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2131, 2145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(496),
+            id: DeclarationId(498),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18553,7 +18587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2400, 2412),
         });
         declarations.push(Declaration {
-            id: DeclarationId(497),
+            id: DeclarationId(499),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18567,7 +18601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2415, 2425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(498),
+            id: DeclarationId(500),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18581,7 +18615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2743, 2755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(499),
+            id: DeclarationId(501),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18595,7 +18629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2758, 2774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(500),
+            id: DeclarationId(502),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18609,7 +18643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2777, 2788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(501),
+            id: DeclarationId(503),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(39),
@@ -18629,13 +18663,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 3433, 3441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(502),
+            id: DeclarationId(504),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(70),
+                template: DeclarationId(29),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(71),
-                    value: DeclarationId(8),
+                    parameter: DeclarationId(30),
+                    value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -18646,16 +18680,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1272, 1292),
+            span: SourceSpan::new("dsl/std/float.dag", 1475, 1496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(503),
+            id: DeclarationId(505),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(71),
-                    value: DeclarationId(9),
+                    value: DeclarationId(8),
                 }],
             },
             type_params: vec![],
@@ -18666,16 +18700,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1331, 1351),
+            span: SourceSpan::new("dsl/std/float.dag", 1747, 1767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(504),
+            id: DeclarationId(506),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(29),
+                template: DeclarationId(70),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(30),
-                    value: DeclarationId(93),
+                    parameter: DeclarationId(71),
+                    value: DeclarationId(9),
                 }],
             },
             type_params: vec![],
@@ -18686,10 +18720,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1601, 1622),
+            span: SourceSpan::new("dsl/std/float.dag", 1797, 1817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(505),
+            id: DeclarationId(507),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -18708,13 +18742,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(506),
+            id: DeclarationId(508),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -18728,11 +18762,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4054, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(507),
+            id: DeclarationId(509),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -18747,11 +18781,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(508),
+            id: DeclarationId(510),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -18766,13 +18800,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(509),
+            id: DeclarationId(511),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -18786,7 +18820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6508, 6520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(510),
+            id: DeclarationId(512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18800,7 +18834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7586, 7590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(511),
+            id: DeclarationId(513),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18814,13 +18848,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7593, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(512),
+            id: DeclarationId(514),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(152),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(154),
                 }],
             },
             type_params: vec![],
@@ -18834,13 +18868,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12459, 12476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(513),
+            id: DeclarationId(515),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(153),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(155),
                 }],
             },
             type_params: vec![],
@@ -18854,7 +18888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12510, 12527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(514),
+            id: DeclarationId(516),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18868,7 +18902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16688, 16693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(515),
+            id: DeclarationId(517),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18882,7 +18916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16696, 16701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(516),
+            id: DeclarationId(518),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18896,7 +18930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16704, 16711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(517),
+            id: DeclarationId(519),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18910,7 +18944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16863, 16867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(518),
+            id: DeclarationId(520),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18924,7 +18958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16870, 16879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(519),
+            id: DeclarationId(521),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18938,7 +18972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16882, 16888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(520),
+            id: DeclarationId(522),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18952,7 +18986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16891, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(521),
+            id: DeclarationId(523),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18966,7 +19000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16919, 16927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(522),
+            id: DeclarationId(524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18980,7 +19014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16930, 16939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(523),
+            id: DeclarationId(525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18994,7 +19028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16942, 16948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(524),
+            id: DeclarationId(526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19008,7 +19042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16968, 16970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(525),
+            id: DeclarationId(527),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19022,7 +19056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16973, 16974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(526),
+            id: DeclarationId(528),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19036,7 +19070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16977, 16978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(527),
+            id: DeclarationId(529),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19050,7 +19084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16981, 16982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(528),
+            id: DeclarationId(530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19064,12 +19098,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16985, 16987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(529),
+            id: DeclarationId(531),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "secret_name".to_string(),
-                    ty: DeclarationId(149),
+                    ty: DeclarationId(151),
                 }],
             },
             type_params: vec![],
@@ -19083,12 +19117,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17259, 17294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(530),
+            id: DeclarationId(532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "env_var".to_string(),
-                    ty: DeclarationId(149),
+                    ty: DeclarationId(151),
                 }],
             },
             type_params: vec![],
@@ -19102,11 +19136,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17299, 17340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(531),
+            id: DeclarationId(533),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(178),
+                    DeclarationId(180),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -19121,13 +19155,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17415, 17435),
         });
         declarations.push(Declaration {
-            id: DeclarationId(532),
+            id: DeclarationId(534),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -19141,21 +19175,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17450, 17462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(533),
+            id: DeclarationId(535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "audience".to_string(),
-                        ty: DeclarationId(149),
+                        ty: DeclarationId(151),
                     },
                     Field {
                         label: "service_account".to_string(),
-                        ty: DeclarationId(531),
+                        ty: DeclarationId(533),
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(532),
+                        ty: DeclarationId(534),
                     },
                 ],
             },
@@ -19170,13 +19204,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17345, 17468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(534),
+            id: DeclarationId(536),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -19190,12 +19224,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17499, 17511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(535),
+            id: DeclarationId(537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "scopes".to_string(),
-                    ty: DeclarationId(534),
+                    ty: DeclarationId(536),
                 }],
             },
             type_params: vec![],
@@ -19209,13 +19243,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17473, 17513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(536),
+            id: DeclarationId(538),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(183),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(185),
                 }],
             },
             type_params: vec![],
@@ -19229,12 +19263,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17535, 17555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(537),
+            id: DeclarationId(539),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(536),
+                    ty: DeclarationId(538),
                 }],
             },
             type_params: vec![],
@@ -19248,7 +19282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17518, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(538),
+            id: DeclarationId(540),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19262,7 +19296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17644, 17650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(539),
+            id: DeclarationId(541),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19276,7 +19310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17653, 17656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(540),
+            id: DeclarationId(542),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19290,7 +19324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17659, 17666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(541),
+            id: DeclarationId(543),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19304,7 +19338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17669, 17672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(542),
+            id: DeclarationId(544),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19318,7 +19352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17675, 17680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(543),
+            id: DeclarationId(545),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19332,7 +19366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17683, 17687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(544),
+            id: DeclarationId(546),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19346,7 +19380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17690, 17696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(545),
+            id: DeclarationId(547),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19360,7 +19394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17699, 17705),
         });
         declarations.push(Declaration {
-            id: DeclarationId(546),
+            id: DeclarationId(548),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19374,7 +19408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17708, 17716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(547),
+            id: DeclarationId(549),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19388,7 +19422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17719, 17726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(548),
+            id: DeclarationId(550),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19402,7 +19436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17729, 17735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(549),
+            id: DeclarationId(551),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19416,7 +19450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17750, 17763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(550),
+            id: DeclarationId(552),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19430,7 +19464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17766, 17768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(551),
+            id: DeclarationId(553),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19444,7 +19478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17771, 17776),
         });
         declarations.push(Declaration {
-            id: DeclarationId(552),
+            id: DeclarationId(554),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19458,7 +19492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17779, 17782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(553),
+            id: DeclarationId(555),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19472,7 +19506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17793, 17798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(554),
+            id: DeclarationId(556),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19486,7 +19520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17801, 17806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(555),
+            id: DeclarationId(557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19500,7 +19534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17809, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(556),
+            id: DeclarationId(558),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19514,7 +19548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17819, 17826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(557),
+            id: DeclarationId(559),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19528,7 +19562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17829, 17836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(558),
+            id: DeclarationId(560),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19542,7 +19576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17839, 17842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(559),
+            id: DeclarationId(561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19556,7 +19590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17845, 17849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(560),
+            id: DeclarationId(562),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19570,7 +19604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17864, 17871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(561),
+            id: DeclarationId(563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19584,7 +19618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17874, 17877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(562),
+            id: DeclarationId(564),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19598,7 +19632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17880, 17887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(563),
+            id: DeclarationId(565),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19612,7 +19646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17890, 17899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(564),
+            id: DeclarationId(566),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19626,7 +19660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17902, 17906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(565),
+            id: DeclarationId(567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19640,7 +19674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17909, 17913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(566),
+            id: DeclarationId(568),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19654,7 +19688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17916, 17926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(567),
+            id: DeclarationId(569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19668,7 +19702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17929, 17933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(568),
+            id: DeclarationId(570),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19682,7 +19716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17936, 17942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(569),
+            id: DeclarationId(571),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19696,7 +19730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17963, 17969),
         });
         declarations.push(Declaration {
-            id: DeclarationId(570),
+            id: DeclarationId(572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19710,7 +19744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17972, 17975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(571),
+            id: DeclarationId(573),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19724,7 +19758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17978, 17987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(572),
+            id: DeclarationId(574),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19738,7 +19772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17990, 17992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(573),
+            id: DeclarationId(575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19752,11 +19786,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17995, 18003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(574),
+            id: DeclarationId(576),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(187),
+                    DeclarationId(189),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -19771,7 +19805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18071, 18078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(575),
+            id: DeclarationId(577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19785,7 +19819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18475, 18486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(576),
+            id: DeclarationId(578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19799,7 +19833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18491, 18500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(577),
+            id: DeclarationId(579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19813,7 +19847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18505, 18512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(578),
+            id: DeclarationId(580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19827,7 +19861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18517, 18524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(579),
+            id: DeclarationId(581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19841,7 +19875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18529, 18534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(580),
+            id: DeclarationId(582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19855,7 +19889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18687, 18697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(581),
+            id: DeclarationId(583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19869,7 +19903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18702, 18711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(582),
+            id: DeclarationId(584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19883,7 +19917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18716, 18722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(583),
+            id: DeclarationId(585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19897,7 +19931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21025, 21028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(584),
+            id: DeclarationId(586),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19911,7 +19945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21031, 21035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(585),
+            id: DeclarationId(587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19925,7 +19959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21038, 21041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(586),
+            id: DeclarationId(588),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19939,7 +19973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21044, 21049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(587),
+            id: DeclarationId(589),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19953,7 +19987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21052, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(588),
+            id: DeclarationId(590),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19967,7 +20001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21061, 21065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(589),
+            id: DeclarationId(591),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19981,7 +20015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21068, 21075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(590),
+            id: DeclarationId(592),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19995,12 +20029,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21563, 21569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(591),
+            id: DeclarationId(593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20014,12 +20048,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21574, 21597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(592),
+            id: DeclarationId(594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "username".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20033,7 +20067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21602, 21628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(593),
+            id: DeclarationId(595),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20047,11 +20081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21633, 21639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(594),
+            id: DeclarationId(596),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(158),
+                    DeclarationId(160),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20066,11 +20100,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21831, 21841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(595),
+            id: DeclarationId(597),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20085,13 +20119,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21966, 21973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(596),
+            id: DeclarationId(598),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20105,7 +20139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22013, 22025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(597),
+            id: DeclarationId(599),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -20124,13 +20158,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22040, 22044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(598),
+            id: DeclarationId(600),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(211),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(213),
                 }],
             },
             type_params: vec![],
@@ -20144,13 +20178,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23395, 23413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(599),
+            id: DeclarationId(601),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(212),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(214),
                 }],
             },
             type_params: vec![],
@@ -20164,11 +20198,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23506, 23527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(600),
+            id: DeclarationId(602),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20183,13 +20217,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23811, 23818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(601),
+            id: DeclarationId(603),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(216),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(218),
                 }],
             },
             type_params: vec![],
@@ -20203,13 +20237,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23851, 23866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(602),
+            id: DeclarationId(604),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(219),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(221),
                 }],
             },
             type_params: vec![],
@@ -20223,13 +20257,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24155, 24173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(603),
+            id: DeclarationId(605),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(220),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(222),
                 }],
             },
             type_params: vec![],
@@ -20243,13 +20277,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24183, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(604),
+            id: DeclarationId(606),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20263,11 +20297,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24223, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(605),
+            id: DeclarationId(607),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20282,11 +20316,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24323, 24330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(606),
+            id: DeclarationId(608),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20301,13 +20335,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24417, 24424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(607),
+            id: DeclarationId(609),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20321,13 +20355,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24452, 24464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(608),
+            id: DeclarationId(610),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20341,13 +20375,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24476, 24488),
         });
         declarations.push(Declaration {
-            id: DeclarationId(609),
+            id: DeclarationId(611),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20361,11 +20395,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24500, 24512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(610),
+            id: DeclarationId(612),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(223),
+                    DeclarationId(225),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20380,11 +20414,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24647, 24662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(611),
+            id: DeclarationId(613),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(189),
+                    DeclarationId(191),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20399,11 +20433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24673, 24686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(612),
+            id: DeclarationId(614),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(188),
+                    DeclarationId(190),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20418,7 +20452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24702, 24715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(613),
+            id: DeclarationId(615),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20432,7 +20466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24741, 24745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(614),
+            id: DeclarationId(616),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20446,7 +20480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24748, 24750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(615),
+            id: DeclarationId(617),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20460,7 +20494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24753, 24754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(616),
+            id: DeclarationId(618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20474,11 +20508,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24757, 24761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(617),
+            id: DeclarationId(619),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20493,18 +20527,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24825, 24832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(618),
+            id: DeclarationId(620),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
@@ -20519,17 +20553,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3063, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(619),
+            id: DeclarationId(621),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(93),
                     },
                 ],
@@ -20545,18 +20579,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3533, 3549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(620),
+            id: DeclarationId(622),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
@@ -20571,18 +20605,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4740, 4757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(621),
+            id: DeclarationId(623),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
                     },
                 ],
             },
@@ -20597,11 +20631,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 5722, 5741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(622),
+            id: DeclarationId(624),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(8))),
             },
             type_params: vec![],
@@ -20615,11 +20649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10914, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(623),
+            id: DeclarationId(625),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(14))),
             },
             type_params: vec![],
@@ -20633,11 +20667,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10966, 10991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(624),
+            id: DeclarationId(626),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(20))),
             },
             type_params: vec![],
@@ -20651,7 +20685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11122, 11147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(625),
+            id: DeclarationId(627),
             name: Some("<registered predicate not lowered: SecretValue>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20665,7 +20699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11305, 11347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(626),
+            id: DeclarationId(628),
             name: Some("<registered predicate not lowered: NonEmptyStr>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20679,7 +20713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11534, 11579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(627),
+            id: DeclarationId(629),
             name: Some("<registered predicate not lowered: LanguageId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20693,7 +20727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11580, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(628),
+            id: DeclarationId(630),
             name: Some("<registered predicate not lowered: SecretName>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20707,7 +20741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11626, 11671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(629),
+            id: DeclarationId(631),
             name: Some("<registered predicate not lowered: PathSegment>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20721,7 +20755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12306, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(630),
+            id: DeclarationId(632),
             name: Some("<registered predicate not lowered: GlobSegment>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20735,7 +20769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12366, 12425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(631),
+            id: DeclarationId(633),
             name: Some("<registered predicate not lowered: FilePath>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20749,11 +20783,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12530, 12573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(632),
+            id: DeclarationId(634),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(23))),
             },
             type_params: vec![],
@@ -20767,11 +20801,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13409, 13422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(633),
+            id: DeclarationId(635),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(26))),
             },
             type_params: vec![],
@@ -20785,11 +20819,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13454, 13467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(634),
+            id: DeclarationId(636),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(29))),
             },
             type_params: vec![],
@@ -20803,11 +20837,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13980, 13993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(635),
+            id: DeclarationId(637),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(32))),
             },
             type_params: vec![],
@@ -20821,7 +20855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14025, 14038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(636),
+            id: DeclarationId(638),
             name: Some("<registered predicate not lowered: IntentId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20835,7 +20869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14562, 14617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(637),
+            id: DeclarationId(639),
             name: Some("<registered predicate not lowered: IssueId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20849,7 +20883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14618, 14672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(638),
+            id: DeclarationId(640),
             name: Some("<registered predicate not lowered: RunKey>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20863,7 +20897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14673, 14726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(639),
+            id: DeclarationId(641),
             name: Some("<registered predicate not lowered: ArtifactId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20877,7 +20911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14727, 14784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(640),
+            id: DeclarationId(642),
             name: Some("<registered predicate not lowered: LeaseToken>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20891,7 +20925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14785, 14842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(641),
+            id: DeclarationId(643),
             name: Some("<registered predicate not lowered: WorkerId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20905,7 +20939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14843, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(642),
+            id: DeclarationId(644),
             name: Some("<registered predicate not lowered: CommentId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20919,7 +20953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14899, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(643),
+            id: DeclarationId(645),
             name: Some("<registered predicate not lowered: SignalKey>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20933,7 +20967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14956, 15012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(644),
+            id: DeclarationId(646),
             name: Some("<registered predicate not lowered: ContentHash>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20947,7 +20981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15013, 15071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(645),
+            id: DeclarationId(647),
             name: Some("<registered predicate not lowered: WorkflowProducerId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20961,7 +20995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15302, 15373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(646),
+            id: DeclarationId(648),
             name: Some("<registered predicate not lowered: WorkflowObserverId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20975,7 +21009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15374, 15445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(647),
+            id: DeclarationId(649),
             name: Some("<registered predicate not lowered: WorkflowProverId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20989,7 +21023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15446, 15513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(648),
+            id: DeclarationId(650),
             name: Some("<registered predicate not lowered: WorkflowRunId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21003,7 +21037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15514, 15575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(649),
+            id: DeclarationId(651),
             name: Some("<registered predicate not lowered: GitRef>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21017,7 +21051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15655, 15697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(650),
+            id: DeclarationId(652),
             name: Some("<registered predicate not lowered: GcpProjectId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21031,7 +21065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16082, 16124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(651),
+            id: DeclarationId(653),
             name: Some("<registered predicate not lowered: FilesystemHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21045,7 +21079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22123, 22187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(652),
+            id: DeclarationId(654),
             name: Some("<registered predicate not lowered: NetworkHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21059,7 +21093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22188, 22245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(653),
+            id: DeclarationId(655),
             name: Some("<registered predicate not lowered: ToolHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21073,7 +21107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22246, 22302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(654),
+            id: DeclarationId(656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21087,7 +21121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3679, 3689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(655),
+            id: DeclarationId(657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21101,7 +21135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3692, 3697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(656),
+            id: DeclarationId(658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21115,7 +21149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3700, 3710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(657),
+            id: DeclarationId(659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21129,7 +21163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3713, 3726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(658),
+            id: DeclarationId(660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21143,7 +21177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4762, 4771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(659),
+            id: DeclarationId(661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21157,7 +21191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4774, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(660),
+            id: DeclarationId(662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21171,13 +21205,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4783, 4787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(661),
+            id: DeclarationId(663),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
@@ -21191,12 +21225,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 5335, 5353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(662),
+            id: DeclarationId(664),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(93),
                 }],
             },
@@ -21211,13 +21245,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6155, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(663),
+            id: DeclarationId(665),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
@@ -21231,13 +21265,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6404, 6422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(664),
+            id: DeclarationId(666),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(45),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(46),
-                    value: DeclarationId(126),
+                    value: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -21251,21 +21285,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7574, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(665),
+            id: DeclarationId(667),
             name: Some("List".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1683),
+                        ty: DeclarationId(1685),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1685),
+                        ty: DeclarationId(1687),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(666)],
+            type_params: vec![DeclarationId(668)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21276,7 +21310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2083, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(666),
+            id: DeclarationId(668),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21290,14 +21324,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2083, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(667),
+            id: DeclarationId(669),
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1653),
+                output: DeclarationId(1655),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
-            type_params: vec![DeclarationId(668)],
+            type_params: vec![DeclarationId(670)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21308,7 +21342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3236, 3284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(668),
+            id: DeclarationId(670),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21322,14 +21356,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3236, 3284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(669),
+            id: DeclarationId(671),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(670), DeclarationId(1654)],
-                output: DeclarationId(1655),
+                inputs: vec![DeclarationId(672), DeclarationId(1656)],
+                output: DeclarationId(1657),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
-            type_params: vec![DeclarationId(670)],
+            type_params: vec![DeclarationId(672)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21340,7 +21374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3383, 3475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(670),
+            id: DeclarationId(672),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21354,14 +21388,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3383, 3475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(671),
+            id: DeclarationId(673),
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(672)],
-                output: DeclarationId(1656),
+                inputs: vec![DeclarationId(674)],
+                output: DeclarationId(1658),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
-            type_params: vec![DeclarationId(672)],
+            type_params: vec![DeclarationId(674)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21372,7 +21406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3519, 3590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(672),
+            id: DeclarationId(674),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21386,14 +21420,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3519, 3590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(673),
+            id: DeclarationId(675),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1657), DeclarationId(675), DeclarationId(1658)],
-                output: DeclarationId(675),
+                inputs: vec![DeclarationId(1659), DeclarationId(677), DeclarationId(1660)],
+                output: DeclarationId(677),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
-            type_params: vec![DeclarationId(674), DeclarationId(675)],
+            type_params: vec![DeclarationId(676), DeclarationId(677)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21404,7 +21438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(674),
+            id: DeclarationId(676),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21418,7 +21452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(675),
+            id: DeclarationId(677),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("U".to_string())),
             type_params: vec![],
@@ -21432,14 +21466,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(676),
+            id: DeclarationId(678),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1659), DeclarationId(678), DeclarationId(1660)],
-                output: DeclarationId(678),
+                inputs: vec![DeclarationId(1661), DeclarationId(680), DeclarationId(1662)],
+                output: DeclarationId(680),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
-            type_params: vec![DeclarationId(677), DeclarationId(678)],
+            type_params: vec![DeclarationId(679), DeclarationId(680)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21450,7 +21484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(677),
+            id: DeclarationId(679),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21464,7 +21498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(678),
+            id: DeclarationId(680),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("U".to_string())),
             type_params: vec![],
@@ -21478,14 +21512,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(679),
+            id: DeclarationId(681),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1661), DeclarationId(1662)],
-                output: DeclarationId(1663),
+                inputs: vec![DeclarationId(1663), DeclarationId(1664)],
+                output: DeclarationId(1665),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
-            type_params: vec![DeclarationId(680)],
+            type_params: vec![DeclarationId(682)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21496,7 +21530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5314, 5414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(680),
+            id: DeclarationId(682),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21510,14 +21544,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5314, 5414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(681),
+            id: DeclarationId(683),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1664), DeclarationId(1665)],
-                output: DeclarationId(1666),
+                inputs: vec![DeclarationId(1666), DeclarationId(1667)],
+                output: DeclarationId(1668),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
-            type_params: vec![DeclarationId(682), DeclarationId(683)],
+            type_params: vec![DeclarationId(684), DeclarationId(685)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21528,7 +21562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(682),
+            id: DeclarationId(684),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("A".to_string())),
             type_params: vec![],
@@ -21542,7 +21576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(683),
+            id: DeclarationId(685),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("B".to_string())),
             type_params: vec![],
@@ -21556,14 +21590,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(684),
+            id: DeclarationId(686),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1667), DeclarationId(1668)],
-                output: DeclarationId(1669),
+                inputs: vec![DeclarationId(1669), DeclarationId(1670)],
+                output: DeclarationId(1671),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
-            type_params: vec![DeclarationId(685)],
+            type_params: vec![DeclarationId(687)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21574,7 +21608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5848, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(685),
+            id: DeclarationId(687),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21588,14 +21622,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5848, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(686),
+            id: DeclarationId(688),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1670), DeclarationId(1672)],
-                output: DeclarationId(1673),
+                inputs: vec![DeclarationId(1672), DeclarationId(1674)],
+                output: DeclarationId(1675),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
-            type_params: vec![DeclarationId(687), DeclarationId(688)],
+            type_params: vec![DeclarationId(689), DeclarationId(690)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21606,7 +21640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(687),
+            id: DeclarationId(689),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("A".to_string())),
             type_params: vec![],
@@ -21620,7 +21654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(688),
+            id: DeclarationId(690),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("B".to_string())),
             type_params: vec![],
@@ -21634,14 +21668,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(689),
+            id: DeclarationId(691),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1674)],
+                inputs: vec![DeclarationId(1676)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
-            type_params: vec![DeclarationId(690)],
+            type_params: vec![DeclarationId(692)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21652,7 +21686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6337, 6409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(690),
+            id: DeclarationId(692),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21666,14 +21700,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6337, 6409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(691),
+            id: DeclarationId(693),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1675)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1677)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
-            type_params: vec![DeclarationId(692)],
+            type_params: vec![DeclarationId(694)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21684,7 +21718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6567, 6671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(692),
+            id: DeclarationId(694),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21698,7 +21732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6567, 6671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(693),
+            id: DeclarationId(695),
             name: Some("IndexedElement".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -21708,11 +21742,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(694),
+                        ty: DeclarationId(696),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(694)],
+            type_params: vec![DeclarationId(696)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21723,7 +21757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6993, 7055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(694),
+            id: DeclarationId(696),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21737,14 +21771,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6993, 7055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(695),
+            id: DeclarationId(697),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1676)],
-                output: DeclarationId(1678),
+                inputs: vec![DeclarationId(1678)],
+                output: DeclarationId(1680),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
-            type_params: vec![DeclarationId(696)],
+            type_params: vec![DeclarationId(698)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21755,7 +21789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7180, 7269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(696),
+            id: DeclarationId(698),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21769,14 +21803,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7180, 7269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(697),
+            id: DeclarationId(699),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1679), DeclarationId(93)],
-                output: DeclarationId(1681),
+                inputs: vec![DeclarationId(1681), DeclarationId(93)],
+                output: DeclarationId(1683),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
-            type_params: vec![DeclarationId(698)],
+            type_params: vec![DeclarationId(700)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21787,7 +21821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7386, 7644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(698),
+            id: DeclarationId(700),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21801,14 +21835,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7386, 7644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(699),
+            id: DeclarationId(701),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1682), DeclarationId(700)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1684), DeclarationId(702)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
-            type_params: vec![DeclarationId(700)],
+            type_params: vec![DeclarationId(702)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21819,7 +21853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8156, 8332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(700),
+            id: DeclarationId(702),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21833,7 +21867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8156, 8332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(701),
+            id: DeclarationId(703),
             name: Some("NodeId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21847,7 +21881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1364, 1375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(702),
+            id: DeclarationId(704),
             name: Some("PortId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21861,7 +21895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1376, 1387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(703),
+            id: DeclarationId(705),
             name: Some("DeclarationId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21875,7 +21909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1388, 1406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(704),
+            id: DeclarationId(706),
             name: Some("ClusterId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21889,21 +21923,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1407, 1421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(705),
+            id: DeclarationId(707),
             name: Some("NonEmptyList".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "first".to_string(),
-                        ty: DeclarationId(706),
+                        ty: DeclarationId(708),
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1686),
+                        ty: DeclarationId(1688),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(706)],
+            type_params: vec![DeclarationId(708)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21914,7 +21948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1423, 1492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(706),
+            id: DeclarationId(708),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21928,25 +21962,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1423, 1492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(707),
+            id: DeclarationId(709),
             name: Some("NonSingletonList".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "first".to_string(),
-                        ty: DeclarationId(708),
+                        ty: DeclarationId(710),
                     },
                     Field {
                         label: "second".to_string(),
-                        ty: DeclarationId(708),
+                        ty: DeclarationId(710),
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1687),
+                        ty: DeclarationId(1689),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(708)],
+            type_params: vec![DeclarationId(710)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21957,7 +21991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1494, 1585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(708),
+            id: DeclarationId(710),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21971,17 +22005,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1494, 1585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(709),
+            id: DeclarationId(711),
             name: Some("UrlPathToken".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1702),
+                        ty: DeclarationId(1704),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1703),
+                        ty: DeclarationId(1705),
                     },
                 ],
             },
@@ -21996,12 +22030,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7510, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(710),
+            id: DeclarationId(712),
             name: Some("PathTemplate".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1704),
+                    ty: DeclarationId(1706),
                 }],
             },
             type_params: vec![],
@@ -22015,17 +22049,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7597, 7647),
         });
         declarations.push(Declaration {
-            id: DeclarationId(711),
+            id: DeclarationId(713),
             name: Some("PathSegmentTokensResult".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1706),
+                        ty: DeclarationId(1708),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1707),
+                        ty: DeclarationId(1709),
                     },
                 ],
             },
@@ -22040,17 +22074,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8003, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(712),
+            id: DeclarationId(714),
             name: Some("PathTemplateParseResult".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1708),
+                        ty: DeclarationId(1710),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1709),
+                        ty: DeclarationId(1711),
                     },
                 ],
             },
@@ -22065,11 +22099,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8477, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(713),
+            id: DeclarationId(715),
             name: Some("parse_path_template".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(712),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(714),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 8695, 10000)),
             },
             type_params: vec![],
@@ -22083,11 +22117,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8632, 10000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(714),
+            id: DeclarationId(716),
             name: Some("parse_segment_tokens".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(711),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(713),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 10066, 11705)),
             },
             type_params: vec![],
@@ -22101,11 +22135,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 10002, 11705),
         });
         declarations.push(Declaration {
-            id: DeclarationId(715),
+            id: DeclarationId(717),
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(710)],
-                output: DeclarationId(1688),
+                inputs: vec![DeclarationId(712)],
+                output: DeclarationId(1690),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -22119,21 +22153,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11707, 12044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(716),
+            id: DeclarationId(718),
             name: Some("IdempotentShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1710),
+                        ty: DeclarationId(1712),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1711),
+                        ty: DeclarationId(1713),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1712),
+                        ty: DeclarationId(1714),
                     },
                 ],
             },
@@ -22148,17 +22182,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14330, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(717),
+            id: DeclarationId(719),
             name: Some("BreakingShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1715),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1714),
+                        ty: DeclarationId(1716),
                     },
                 ],
             },
@@ -22173,17 +22207,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14674, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(718),
+            id: DeclarationId(720),
             name: Some("EffectShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1715),
+                        ty: DeclarationId(1717),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1716),
+                        ty: DeclarationId(1718),
                     },
                 ],
             },
@@ -22198,17 +22232,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15150, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(719),
+            id: DeclarationId(721),
             name: Some("CreateCause".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1717),
+                        ty: DeclarationId(1719),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1718),
+                        ty: DeclarationId(1720),
                     },
                 ],
             },
@@ -22223,21 +22257,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15722, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(720),
+            id: DeclarationId(722),
             name: Some("KeySource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1721),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1720),
+                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1722),
+                        ty: DeclarationId(1724),
                     },
                 ],
             },
@@ -22252,21 +22286,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16482, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(721),
+            id: DeclarationId(723),
             name: Some("IdempotencyEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1727),
                     },
                 ],
             },
@@ -22281,11 +22315,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17251, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(722),
+            id: DeclarationId(724),
             name: Some("is_idempotent_effect".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(718)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(720)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
             },
             type_params: vec![],
@@ -22299,11 +22333,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17524, 17648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(723),
+            id: DeclarationId(725),
             name: Some("derive_idempotency_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(718)],
-                output: DeclarationId(721),
+                inputs: vec![DeclarationId(720)],
+                output: DeclarationId(723),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
             },
             type_params: vec![],
@@ -22317,17 +22351,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17787, 18381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(724),
+            id: DeclarationId(726),
             name: Some("OperationEffect".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(718),
+                        ty: DeclarationId(720),
                     },
                 ],
             },
@@ -22342,21 +22376,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19065, 19135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(725),
+            id: DeclarationId(727),
             name: Some("DeriveOpEffectResult".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1726),
+                        ty: DeclarationId(1728),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1727),
+                        ty: DeclarationId(1729),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1730),
                     },
                 ],
             },
@@ -22371,17 +22405,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19489, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(726),
+            id: DeclarationId(728),
             name: Some("CompositionVerdict".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1731),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1731),
+                        ty: DeclarationId(1733),
                     },
                 ],
             },
@@ -22396,11 +22430,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20510, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(727),
+            id: DeclarationId(729),
             name: Some("operation_is_breaking".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(724)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(726)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
             },
             type_params: vec![],
@@ -22414,11 +22448,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884),
         });
         declarations.push(Declaration {
-            id: DeclarationId(728),
+            id: DeclarationId(730),
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1689),
+                output: DeclarationId(1691),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -22432,11 +22466,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(729),
+            id: DeclarationId(731),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1690)],
-                output: DeclarationId(1692),
+                inputs: vec![DeclarationId(1692)],
+                output: DeclarationId(1694),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -22450,11 +22484,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(730),
+            id: DeclarationId(732),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1693)],
-                output: DeclarationId(1695),
+                inputs: vec![DeclarationId(1695)],
+                output: DeclarationId(1697),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -22468,11 +22502,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(731),
+            id: DeclarationId(733),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1696)],
-                output: DeclarationId(726),
+                inputs: vec![DeclarationId(1698)],
+                output: DeclarationId(728),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
             type_params: vec![],
@@ -22486,12 +22520,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 22240, 22436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(732),
+            id: DeclarationId(734),
             name: Some("BoolPortRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "port".to_string(),
-                    ty: DeclarationId(702),
+                    ty: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -22505,17 +22539,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 23637, 23672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(733),
+            id: DeclarationId(735),
             name: Some("BranchArm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "condition".to_string(),
-                        ty: DeclarationId(732),
+                        ty: DeclarationId(734),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(734),
+                        ty: DeclarationId(736),
                     },
                 ],
             },
@@ -22530,25 +22564,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 23757, 23823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(734),
+            id: DeclarationId(736),
             name: Some("WorkflowEffect".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1733),
+                        ty: DeclarationId(1735),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1735),
+                        ty: DeclarationId(1737),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1736),
+                        ty: DeclarationId(1738),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1738),
+                        ty: DeclarationId(1740),
                     },
                 ],
             },
@@ -22563,21 +22597,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24499, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(735),
+            id: DeclarationId(737),
             name: Some("IdempotencyUnsupportedDetail".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "variant_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "downstream_stage".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -22592,17 +22626,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25086, 25190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(736),
+            id: DeclarationId(738),
             name: Some("WorkflowIdempotencyReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1739),
+                        ty: DeclarationId(1741),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1740),
+                        ty: DeclarationId(1742),
                     },
                 ],
             },
@@ -22617,11 +22651,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25329, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(737),
+            id: DeclarationId(739),
             name: Some("report_unsupported_workflow_variant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228), DeclarationId(228)],
-                output: DeclarationId(736),
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
             },
             type_params: vec![],
@@ -22635,29 +22669,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25469, 25765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(738),
+            id: DeclarationId(740),
             name: Some("ParallelismUnsupportedKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1744),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1743),
+                        ty: DeclarationId(1745),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1744),
+                        ty: DeclarationId(1746),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1745),
+                        ty: DeclarationId(1747),
                     },
                 ],
             },
@@ -22672,21 +22706,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25928, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(739),
+            id: DeclarationId(741),
             name: Some("ParallelismUnsupportedDetail".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(738),
+                        ty: DeclarationId(740),
                     },
                     Field {
                         label: "downstream_stage".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -22701,17 +22735,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26086, 26202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(740),
+            id: DeclarationId(742),
             name: Some("WorkflowParallelismReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1748),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1749),
                     },
                 ],
             },
@@ -22726,11 +22760,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26366, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(741),
+            id: DeclarationId(743),
             name: Some("report_parallelism_unsupported".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(738), DeclarationId(228)],
-                output: DeclarationId(740),
+                inputs: vec![DeclarationId(740), DeclarationId(230)],
+                output: DeclarationId(742),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
             },
             type_params: vec![],
@@ -22744,11 +22778,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26506, 26780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(742),
+            id: DeclarationId(744),
             name: Some("lane2_workflow_idempotency_report".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(734)],
-                output: DeclarationId(736),
+                inputs: vec![DeclarationId(736)],
+                output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
             },
             type_params: vec![],
@@ -22762,11 +22796,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(743),
+            id: DeclarationId(745),
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1697),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1699),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -22780,11 +22814,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29658, 30005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(744),
+            id: DeclarationId(746),
             name: Some("keyless_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(196)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(198)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
             },
             type_params: vec![],
@@ -22798,11 +22832,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(745),
+            id: DeclarationId(747),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1698), DeclarationId(196)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(1700), DeclarationId(198)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
             type_params: vec![],
@@ -22816,11 +22850,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(746),
+            id: DeclarationId(748),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1699), DeclarationId(196)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(1701), DeclarationId(198)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
             type_params: vec![],
@@ -22834,11 +22868,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30630, 30858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(747),
+            id: DeclarationId(749),
             name: Some("derive_effect_shape".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(196), DeclarationId(710)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(198), DeclarationId(712)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
             },
             type_params: vec![],
@@ -22852,11 +22886,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30860, 31429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(748),
+            id: DeclarationId(750),
             name: Some("derive_op_effect".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(196), DeclarationId(710)],
-                output: DeclarationId(725),
+                inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(712)],
+                output: DeclarationId(727),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
             },
             type_params: vec![],
@@ -22870,21 +22904,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 31431, 31731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(749),
+            id: DeclarationId(751),
             name: Some("ModifierAgreement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1748),
+                        ty: DeclarationId(1750),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1749),
+                        ty: DeclarationId(1751),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1752),
                     },
                 ],
             },
@@ -22899,17 +22933,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32431, 32548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(750),
+            id: DeclarationId(752),
             name: Some("ModifierAxisCheck".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1753),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1754),
                     },
                 ],
             },
@@ -22924,25 +22958,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32995, 33095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(751),
+            id: DeclarationId(753),
             name: Some("ModifierCheck".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "derived_shape".to_string(),
-                        ty: DeclarationId(718),
+                        ty: DeclarationId(720),
                     },
                     Field {
                         label: "idempotent_check".to_string(),
-                        ty: DeclarationId(750),
+                        ty: DeclarationId(752),
                     },
                     Field {
                         label: "readonly_check".to_string(),
-                        ty: DeclarationId(750),
+                        ty: DeclarationId(752),
                     },
                 ],
             },
@@ -22957,11 +22991,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33097, 33247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(752),
+            id: DeclarationId(754),
             name: Some("classify_idempotent_disagreement".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(717)],
-                output: DeclarationId(749),
+                inputs: vec![DeclarationId(719)],
+                output: DeclarationId(751),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
             },
             type_params: vec![],
@@ -22975,11 +23009,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33807, 34428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(753),
+            id: DeclarationId(755),
             name: Some("classify_readonly_agreement".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(718)],
-                output: DeclarationId(749),
+                inputs: vec![DeclarationId(720)],
+                output: DeclarationId(751),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
             },
             type_params: vec![],
@@ -22993,11 +23027,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 34760, 35274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(754),
+            id: DeclarationId(756),
             name: Some("check_modifier_vs_derivation".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(724), DeclarationId(126), DeclarationId(126)],
-                output: DeclarationId(751),
+                inputs: vec![DeclarationId(726), DeclarationId(128), DeclarationId(128)],
+                output: DeclarationId(753),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
             },
             type_params: vec![],
@@ -23011,25 +23045,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 35276, 36055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(755),
+            id: DeclarationId(757),
             name: Some("IdempotencyTestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "effect_shape".to_string(),
-                        ty: DeclarationId(718),
+                        ty: DeclarationId(720),
                     },
                     Field {
                         label: "claim".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "witness_required".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -23044,11 +23078,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(756),
+            id: DeclarationId(758),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1700)],
-                output: DeclarationId(1701),
+                inputs: vec![DeclarationId(1702)],
+                output: DeclarationId(1703),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
             },
             type_params: vec![],
@@ -23062,21 +23096,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36537, 36910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(757),
+            id: DeclarationId(759),
             name: Some("WorkflowEffectConcern".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "workflow_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "create_op".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -23091,12 +23125,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 37227, 37318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(758),
+            id: DeclarationId(760),
             name: Some("TypeShape".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "declaration".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -23110,21 +23144,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 270, 317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(759),
+            id: DeclarationId(761),
             name: Some("PortState".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1763),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1764),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1765),
                     },
                 ],
             },
@@ -23139,21 +23173,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 460, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(760),
+            id: DeclarationId(762),
             name: Some("DagPort".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(759),
+                        ty: DeclarationId(761),
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1766),
                     },
                 ],
             },
@@ -23168,21 +23202,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 530, 601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(761),
+            id: DeclarationId(763),
             name: Some("LiteralBits".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1767),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1768),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1769),
                     },
                 ],
             },
@@ -23197,29 +23231,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1083, 1158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(762),
+            id: DeclarationId(764),
             name: Some("AtomPayload".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1770),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1771),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1770),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1773),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1774),
                     },
                 ],
             },
@@ -23234,21 +23268,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3270, 3439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(763),
+            id: DeclarationId(765),
             name: Some("PositiveIntervalWidth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1775),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1774),
+                        ty: DeclarationId(1776),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1775),
+                        ty: DeclarationId(1777),
                     },
                 ],
             },
@@ -23263,17 +23297,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4032, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(764),
+            id: DeclarationId(766),
             name: Some("IntervalWidth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1776),
+                        ty: DeclarationId(1778),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1777),
+                        ty: DeclarationId(1779),
                     },
                 ],
             },
@@ -23288,21 +23322,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5715, 5788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(765),
+            id: DeclarationId(767),
             name: Some("Interval".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1778),
+                        ty: DeclarationId(1780),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1781),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(766)],
+            type_params: vec![DeclarationId(768)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23313,7 +23347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6079, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(766),
+            id: DeclarationId(768),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("D".to_string())),
             type_params: vec![],
@@ -23327,12 +23361,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6079, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(767),
+            id: DeclarationId(769),
             name: Some("IntInterval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(765),
+                template: DeclarationId(767),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(766),
+                    parameter: DeclarationId(768),
                     value: DeclarationId(93),
                 }],
             },
@@ -23347,17 +23381,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6314, 6346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(768),
+            id: DeclarationId(770),
             name: Some("BoundDeclaration".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1781),
+                        ty: DeclarationId(1783),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1782),
+                        ty: DeclarationId(1784),
                     },
                 ],
             },
@@ -23372,21 +23406,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6702, 6776),
         });
         declarations.push(Declaration {
-            id: DeclarationId(769),
+            id: DeclarationId(771),
             name: Some("CardinalityBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1783),
+                        ty: DeclarationId(1785),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1786),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1785),
+                        ty: DeclarationId(1787),
                     },
                 ],
             },
@@ -23401,17 +23435,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7001, 7065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(770),
+            id: DeclarationId(772),
             name: Some("ConjField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                 ],
             },
@@ -23426,17 +23460,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7067, 7121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(771),
+            id: DeclarationId(773),
             name: Some("TemplateArgument".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "parameter".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                 ],
             },
@@ -23451,17 +23485,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7123, 7198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(772),
+            id: DeclarationId(774),
             name: Some("FieldEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(773),
+                        ty: DeclarationId(775),
                     },
                 ],
             },
@@ -23476,33 +23510,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7200, 7255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(773),
+            id: DeclarationId(775),
             name: Some("FieldValue".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1788),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1787),
+                        ty: DeclarationId(1789),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1789),
+                        ty: DeclarationId(1791),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1791),
+                        ty: DeclarationId(1793),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1793),
+                        ty: DeclarationId(1795),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1795),
+                        ty: DeclarationId(1797),
                     },
                 ],
             },
@@ -23517,29 +23551,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7472, 7708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(774),
+            id: DeclarationId(776),
             name: Some("ValueBody".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1798),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1800),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1801),
+                        ty: DeclarationId(1803),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1803),
+                        ty: DeclarationId(1805),
                     },
                 ],
             },
@@ -23554,12 +23588,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9302, 9507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(775),
+            id: DeclarationId(777),
             name: Some("BindNodeId".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "node".to_string(),
-                    ty: DeclarationId(701),
+                    ty: DeclarationId(703),
                 }],
             },
             type_params: vec![],
@@ -23573,29 +23607,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10411, 10445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(776),
+            id: DeclarationId(778),
             name: Some("ArrowBody".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1804),
+                        ty: DeclarationId(1806),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1807),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1808),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1809),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1810),
                     },
                 ],
             },
@@ -23610,33 +23644,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10742, 10871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(777),
+            id: DeclarationId(779),
             name: Some("TypeConnective".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1811),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1813),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1815),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1817),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1818),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1820),
                     },
                 ],
             },
@@ -23651,49 +23685,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11076, 11476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(778),
+            id: DeclarationId(780),
             name: Some("Declaration".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1819),
+                        ty: DeclarationId(1821),
                     },
                     Field {
                         label: "connective".to_string(),
-                        ty: DeclarationId(777),
+                        ty: DeclarationId(779),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1822),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1823),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1824),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1825),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -23708,17 +23742,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11478, 11772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(779),
+            id: DeclarationId(781),
             name: Some("PhantomParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "parameter".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                 ],
             },
@@ -23733,12 +23767,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12245, 12322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(780),
+            id: DeclarationId(782),
             name: Some("NominalOpacity".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1826),
+                    ty: DeclarationId(1828),
                 }],
             },
             type_params: vec![],
@@ -23752,25 +23786,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12829, 12895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(781),
+            id: DeclarationId(783),
             name: Some("ArithmeticOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1829),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1831),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1832),
                     },
                 ],
             },
@@ -23785,33 +23819,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13152, 13201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(782),
+            id: DeclarationId(784),
             name: Some("ComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1834),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1836),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1837),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1838),
                     },
                 ],
             },
@@ -23826,7 +23860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13303, 13362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(783),
+            id: DeclarationId(785),
             name: Some("PerfBaselineMeasurement".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23851,17 +23885,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13817, 13886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(784),
+            id: DeclarationId(786),
             name: Some("LogicalOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1840),
                     },
                 ],
             },
@@ -23876,21 +23910,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14120, 14149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(785),
+            id: DeclarationId(787),
             name: Some("OperatorKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1842),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1843),
                     },
                 ],
             },
@@ -23905,25 +23939,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14363, 14461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(786),
+            id: DeclarationId(788),
             name: Some("TransformTarget".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1845),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1847),
                     },
                 ],
             },
@@ -23938,17 +23972,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14623, 14818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(787),
+            id: DeclarationId(789),
             name: Some("BranchPattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -23963,17 +23997,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14920, 15030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(788),
+            id: DeclarationId(790),
             name: Some("PayloadBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "binding_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "payload_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                 ],
             },
@@ -23988,25 +24022,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15032, 15101),
         });
         declarations.push(Declaration {
-            id: DeclarationId(789),
+            id: DeclarationId(791),
             name: Some("BranchPath".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "pattern".to_string(),
-                        ty: DeclarationId(787),
+                        ty: DeclarationId(789),
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1850),
                     },
                 ],
             },
@@ -24021,13 +24055,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15103, 15211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(790),
+            id: DeclarationId(792),
             name: Some("ParamRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "member".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "slot".to_string(),
@@ -24046,12 +24080,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15810, 15856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(791),
+            id: DeclarationId(793),
             name: Some("TransformRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "node".to_string(),
-                    ty: DeclarationId(701),
+                    ty: DeclarationId(703),
                 }],
             },
             type_params: vec![],
@@ -24065,7 +24099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16368, 16404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(792),
+            id: DeclarationId(794),
             name: Some("ElementRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24073,7 +24107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ty: DeclarationId(93),
                 }],
             },
-            type_params: vec![DeclarationId(793)],
+            type_params: vec![DeclarationId(795)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24084,7 +24118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17021, 17062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(793),
+            id: DeclarationId(795),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -24098,12 +24132,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17021, 17062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(794),
+            id: DeclarationId(796),
             name: Some("MemberDescent".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(790),
+                    ty: DeclarationId(792),
                 }],
             },
             type_params: vec![],
@@ -24117,12 +24151,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17064, 17104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(795),
+            id: DeclarationId(797),
             name: Some("IntraClusterCall".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "transform".to_string(),
-                    ty: DeclarationId(791),
+                    ty: DeclarationId(793),
                 }],
             },
             type_params: vec![],
@@ -24136,17 +24170,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17106, 17157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(796),
+            id: DeclarationId(798),
             name: Some("Cluster".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1851),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1852),
                     },
                 ],
             },
@@ -24161,17 +24195,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17159, 17272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(797),
+            id: DeclarationId(799),
             name: Some("LoopBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1853),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1854),
                     },
                 ],
             },
@@ -24186,11 +24220,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17874, 17974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(798),
+            id: DeclarationId(800),
             name: Some("loop_bound_measure".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(797)],
-                output: DeclarationId(702),
+                inputs: vec![DeclarationId(799)],
+                output: DeclarationId(704),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(36))),
             },
             type_params: vec![],
@@ -24204,29 +24238,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17976, 18129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(799),
+            id: DeclarationId(801),
             name: Some("ValueNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(761),
+                        ty: DeclarationId(763),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1855),
                     },
                 ],
             },
@@ -24241,29 +24275,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18131, 18260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(800),
+            id: DeclarationId(802),
             name: Some("TransformNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(786),
+                        ty: DeclarationId(788),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -24278,12 +24312,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18262, 18387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(801),
+            id: DeclarationId(803),
             name: Some("BranchEmitParticipation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1855),
+                    ty: DeclarationId(1857),
                 }],
             },
             type_params: vec![],
@@ -24297,33 +24331,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18552, 18594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(802),
+            id: DeclarationId(804),
             name: Some("BranchNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -24338,37 +24372,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18596, 18758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(803),
+            id: DeclarationId(805),
             name: Some("LoopNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "source".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "init".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(797),
+                        ty: DeclarationId(799),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -24383,12 +24417,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18760, 18897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(804),
+            id: DeclarationId(806),
             name: Some("BindEmitParticipation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1858),
+                    ty: DeclarationId(1860),
                 }],
             },
             type_params: vec![],
@@ -24402,37 +24436,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19139, 19182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(805),
+            id: DeclarationId(807),
             name: Some("BindNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1861),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1862),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1863),
                     },
                 ],
             },
@@ -24447,29 +24481,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19184, 19372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(806),
+            id: DeclarationId(808),
             name: Some("Behavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1864),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1865),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1867),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1868),
                     },
                 ],
             },
@@ -24484,25 +24518,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19444, 19568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(807),
+            id: DeclarationId(809),
             name: Some("Dag".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1870),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1871),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1872),
                     },
                 ],
             },
@@ -24517,12 +24551,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19570, 19689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(808),
+            id: DeclarationId(810),
             name: Some("SubstrateAccessorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "carrier".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -24536,21 +24570,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 21041, 21096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(809),
+            id: DeclarationId(811),
             name: Some("SubstrateAccessorBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -24565,11 +24599,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 21863, 21980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(810),
+            id: DeclarationId(812),
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(702)],
-                output: DeclarationId(1753),
+                inputs: vec![DeclarationId(809), DeclarationId(704)],
+                output: DeclarationId(1755),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22022,
@@ -24587,11 +24621,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 21982, 22037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(811),
+            id: DeclarationId(813),
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701)],
-                output: DeclarationId(1754),
+                inputs: vec![DeclarationId(809), DeclarationId(703)],
+                output: DeclarationId(1756),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22080,
@@ -24609,11 +24643,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22039, 22095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(812),
+            id: DeclarationId(814),
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(702)],
-                output: DeclarationId(1755),
+                inputs: vec![DeclarationId(809), DeclarationId(704)],
+                output: DeclarationId(1757),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22155,
@@ -24631,11 +24665,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22097, 22182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(813),
+            id: DeclarationId(815),
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(703)],
-                output: DeclarationId(1756),
+                inputs: vec![DeclarationId(809), DeclarationId(705)],
+                output: DeclarationId(1758),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22544,
@@ -24653,11 +24687,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22480, 22572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(814),
+            id: DeclarationId(816),
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(228)],
-                output: DeclarationId(1757),
+                inputs: vec![DeclarationId(809), DeclarationId(230)],
+                output: DeclarationId(1759),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23419,
@@ -24675,11 +24709,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23358, 23449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(815),
+            id: DeclarationId(817),
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701)],
-                output: DeclarationId(1758),
+                inputs: vec![DeclarationId(809), DeclarationId(703)],
+                output: DeclarationId(1760),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23745,
@@ -24697,21 +24731,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23685, 23780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(816),
+            id: DeclarationId(818),
             name: Some("WorkflowRoot".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1874),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1876),
                     },
                 ],
             },
@@ -24726,11 +24760,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 25748, 25858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(817),
+            id: DeclarationId(819),
             name: Some("workflow_root_port".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(816),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(818),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     27364,
@@ -24748,11 +24782,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 27318, 27393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(818),
+            id: DeclarationId(820),
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1759),
+                output: DeclarationId(1761),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     27750,
@@ -24770,11 +24804,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 27693, 27760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(819),
+            id: DeclarationId(821),
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(703)],
-                output: DeclarationId(1760),
+                inputs: vec![DeclarationId(705)],
+                output: DeclarationId(1762),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     27835,
@@ -24792,12 +24826,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 27762, 27848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(820),
+            id: DeclarationId(822),
             name: Some("MethodRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1243),
+                    ty: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -24811,21 +24845,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/methods.dag", 1604, 1645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(821),
+            id: DeclarationId(823),
             name: Some("CollectionSizeEffect".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1903),
                     },
                 ],
             },
@@ -24840,25 +24874,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4923, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(822),
+            id: DeclarationId(824),
             name: Some("CostShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1905),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1907),
                     },
                 ],
             },
@@ -24873,29 +24907,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5836, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(823),
+            id: DeclarationId(825),
             name: Some("MethodContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "algebra_id".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "method_id".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1908),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1909),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1910),
                     },
                 ],
             },
@@ -24910,17 +24944,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6688, 6862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(824),
+            id: DeclarationId(826),
             name: Some("SizeVariable".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "source_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1911),
                     },
                 ],
             },
@@ -24935,11 +24969,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7371, 7438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(825),
+            id: DeclarationId(827),
             name: Some("unnamed_size_variable".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(702)],
-                output: DeclarationId(824),
+                inputs: vec![DeclarationId(704)],
+                output: DeclarationId(826),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 7502, 7534)),
             },
             type_params: vec![],
@@ -24953,11 +24987,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7440, 7534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(826),
+            id: DeclarationId(828),
             name: Some("size_variable_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824), DeclarationId(824)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(826), DeclarationId(826)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(40))),
             },
             type_params: vec![],
@@ -24971,17 +25005,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7536, 7632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(827),
+            id: DeclarationId(829),
             name: Some("DegreeAtLeastTwo".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1912),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1913),
                     },
                 ],
             },
@@ -24996,37 +25030,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8379, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(828),
+            id: DeclarationId(830),
             name: Some("SymbolicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1914),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1915),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1916),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1921),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1922),
                     },
                 ],
             },
@@ -25034,24 +25068,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1921)),
+            inhabits: Some(DeclarationId(1923)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/algebra.dag", 9452, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(829),
+            id: DeclarationId(831),
             name: Some("DominateScanAcc".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "any".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "pivot".to_string(),
-                        ty: DeclarationId(828),
+                        ty: DeclarationId(830),
                     },
                 ],
             },
@@ -25066,11 +25100,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10167, 10225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(830),
+            id: DeclarationId(832),
             name: Some("dominate_scan_init".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(831),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(43))),
             },
             type_params: vec![],
@@ -25084,11 +25118,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10227, 10322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(831),
+            id: DeclarationId(833),
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1875),
+                output: DeclarationId(1877),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -25102,11 +25136,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10908, 10973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(832),
+            id: DeclarationId(834),
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(1876),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(1878),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -25120,11 +25154,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10975, 11062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(833),
+            id: DeclarationId(835),
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(1877),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(1879),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(47))),
             },
             type_params: vec![],
@@ -25138,11 +25172,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11064, 11539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(834),
+            id: DeclarationId(836),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828), DeclarationId(1878)],
-                output: DeclarationId(1879),
+                inputs: vec![DeclarationId(830), DeclarationId(830), DeclarationId(1880)],
+                output: DeclarationId(1881),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(49))),
             },
             type_params: vec![],
@@ -25156,11 +25190,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11541, 11726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(835),
+            id: DeclarationId(837),
             name: Some("reject_all_symbolic_costs".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(54))),
             },
             type_params: vec![],
@@ -25174,10 +25208,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11728, 11856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(836),
+            id: DeclarationId(838),
             name: Some("degree_raw".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
+                inputs: vec![DeclarationId(829)],
                 output: DeclarationId(93),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(62))),
             },
@@ -25192,11 +25226,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11858, 12011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(837),
+            id: DeclarationId(839),
             name: Some("sequential".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(66))),
             },
             type_params: vec![],
@@ -25210,11 +25244,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 12247, 12350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(838),
+            id: DeclarationId(840),
             name: Some("iterate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(70))),
             },
             type_params: vec![],
@@ -25228,11 +25262,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 12536, 12654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(839),
+            id: DeclarationId(841),
             name: Some("max_path_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(74))),
             },
             type_params: vec![],
@@ -25246,11 +25280,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 13514, 13681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(840),
+            id: DeclarationId(842),
             name: Some("keep_or_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(78))),
             },
             type_params: vec![],
@@ -25264,11 +25298,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 13683, 13841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(841),
+            id: DeclarationId(843),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1880)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1882)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(82))),
             },
             type_params: vec![],
@@ -25282,11 +25316,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14143, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(842),
+            id: DeclarationId(844),
             name: Some("dominates".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(135))),
             },
             type_params: vec![],
@@ -25300,11 +25334,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 15113, 17198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(843),
+            id: DeclarationId(845),
             name: Some("same_size_variable".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824), DeclarationId(824)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(826), DeclarationId(826)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(137))),
             },
             type_params: vec![],
@@ -25318,41 +25352,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17200, 17290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(844),
+            id: DeclarationId(846),
             name: Some("AsymptoticClass".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1925),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1926),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1927),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1928),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1930),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1931),
                     },
                 ],
             },
@@ -25360,18 +25394,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1930)),
+            inhabits: Some(DeclarationId(1932)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/algebra.dag", 18077, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(845),
+            id: DeclarationId(847),
             name: Some("asymptotic_dominates".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(844), DeclarationId(844)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(846), DeclarationId(846)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(207))),
             },
             type_params: vec![],
@@ -25385,11 +25419,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18320, 20588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(846),
+            id: DeclarationId(848),
             name: Some("meet_asymptotic_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(844), DeclarationId(844)],
-                output: DeclarationId(844),
+                inputs: vec![DeclarationId(846), DeclarationId(846)],
+                output: DeclarationId(846),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(210))),
             },
             type_params: vec![],
@@ -25403,11 +25437,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 20590, 20721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(847),
+            id: DeclarationId(849),
             name: Some("join_asymptotic_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(844), DeclarationId(844)],
-                output: DeclarationId(844),
+                inputs: vec![DeclarationId(846), DeclarationId(846)],
+                output: DeclarationId(846),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(213))),
             },
             type_params: vec![],
@@ -25421,11 +25455,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 20723, 20854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(848),
+            id: DeclarationId(850),
             name: Some("classify_symbolic_cost".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(844),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(846),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 20921, 20954)),
             },
             type_params: vec![],
@@ -25439,11 +25473,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 20856, 20954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(849),
+            id: DeclarationId(851),
             name: Some("normalize".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(222))),
             },
             type_params: vec![],
@@ -25457,11 +25491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21828, 22193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(850),
+            id: DeclarationId(852),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1881)],
-                output: DeclarationId(1882),
+                inputs: vec![DeclarationId(1883)],
+                output: DeclarationId(1884),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(228))),
             },
             type_params: vec![],
@@ -25475,11 +25509,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22195, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(851),
+            id: DeclarationId(853),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1883)],
-                output: DeclarationId(1884),
+                inputs: vec![DeclarationId(1885)],
+                output: DeclarationId(1886),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(241))),
             },
             type_params: vec![],
@@ -25493,11 +25527,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22501, 22793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(852),
+            id: DeclarationId(854),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1885)],
-                output: DeclarationId(1886),
+                inputs: vec![DeclarationId(1887)],
+                output: DeclarationId(1888),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(248))),
             },
             type_params: vec![],
@@ -25511,11 +25545,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23002, 23165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(853),
+            id: DeclarationId(855),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1887)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1889)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(257))),
             },
             type_params: vec![],
@@ -25529,11 +25563,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23167, 23332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(854),
+            id: DeclarationId(856),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1888)],
-                output: DeclarationId(1889),
+                inputs: vec![DeclarationId(1890)],
+                output: DeclarationId(1891),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(270))),
             },
             type_params: vec![],
@@ -25547,11 +25581,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23490, 23796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(855),
+            id: DeclarationId(857),
             name: Some("is_zero_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -25565,11 +25599,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23798, 24052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(856),
+            id: DeclarationId(858),
             name: Some("is_one_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(290))),
             },
             type_params: vec![],
@@ -25583,11 +25617,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24054, 24307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(857),
+            id: DeclarationId(859),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1890)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1892)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(302))),
             },
             type_params: vec![],
@@ -25601,11 +25635,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25092, 25363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(858),
+            id: DeclarationId(860),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1891)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1893)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(314))),
             },
             type_params: vec![],
@@ -25619,11 +25653,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25365, 25640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(859),
+            id: DeclarationId(861),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1892)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1894)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(331))),
             },
             type_params: vec![],
@@ -25637,11 +25671,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25825, 26246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(860),
+            id: DeclarationId(862),
             name: Some("combine_binary_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(340))),
             },
             type_params: vec![],
@@ -25655,11 +25689,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 26411, 26798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(861),
+            id: DeclarationId(863),
             name: Some("combine_linear_with".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824), DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(826), DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(349))),
             },
             type_params: vec![],
@@ -25673,16 +25707,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 26800, 27209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(862),
+            id: DeclarationId(864),
             name: Some("collapse_linear_square".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(824),
-                    DeclarationId(824),
-                    DeclarationId(828),
-                    DeclarationId(828),
+                    DeclarationId(826),
+                    DeclarationId(826),
+                    DeclarationId(830),
+                    DeclarationId(830),
                 ],
-                output: DeclarationId(828),
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(354))),
             },
             type_params: vec![],
@@ -25696,11 +25730,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27211, 27427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(863),
+            id: DeclarationId(865),
             name: Some("polynomial_square".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(826)],
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 27483, 27533)),
             },
             type_params: vec![],
@@ -25714,11 +25748,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27429, 27533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(864),
+            id: DeclarationId(866),
             name: Some("product_pair".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(357))),
             },
             type_params: vec![],
@@ -25732,11 +25766,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27535, 27633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(865),
+            id: DeclarationId(867),
             name: Some("fold_or_dominate_scan".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(828)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(831), DeclarationId(830)],
+                output: DeclarationId(831),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(364))),
             },
             type_params: vec![],
@@ -25750,11 +25784,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27635, 27784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(866),
+            id: DeclarationId(868),
             name: Some("scan_hit".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(831)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -25768,11 +25802,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27786, 27841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(867),
+            id: DeclarationId(869),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1893), DeclarationId(828)],
-                output: DeclarationId(1894),
+                inputs: vec![DeclarationId(1895), DeclarationId(830)],
+                output: DeclarationId(1896),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -25786,11 +25820,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27843, 28205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(868),
+            id: DeclarationId(870),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1895), DeclarationId(828)],
-                output: DeclarationId(1896),
+                inputs: vec![DeclarationId(1897), DeclarationId(830)],
+                output: DeclarationId(1898),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -25804,11 +25838,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28207, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(869),
+            id: DeclarationId(871),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1897)],
-                output: DeclarationId(1898),
+                inputs: vec![DeclarationId(1899)],
+                output: DeclarationId(1900),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(389))),
             },
             type_params: vec![],
@@ -25822,18 +25856,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28637, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(870),
+            id: DeclarationId(872),
             name: Some("anthropic_messages".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(145),
-                    DeclarationId(228),
-                    DeclarationId(1958),
-                    DeclarationId(93),
-                    DeclarationId(1959),
+                    DeclarationId(147),
+                    DeclarationId(230),
                     DeclarationId(1960),
+                    DeclarationId(93),
+                    DeclarationId(1961),
+                    DeclarationId(1962),
                 ],
-                output: DeclarationId(884),
+                output: DeclarationId(886),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/anthropic_messages.dag",
                     4627,
@@ -25851,18 +25885,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4419, 4656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(871),
+            id: DeclarationId(873),
             name: Some("anthropic_operations".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1161),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1163),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1961)),
+            meta_tag: Some(DeclarationId(1963)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -25871,17 +25905,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6515, 6562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(872),
+            id: DeclarationId(874),
             name: Some("AnthropicChatMessage".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1967),
                     },
                 ],
             },
@@ -25896,17 +25930,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2491, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(873),
+            id: DeclarationId(875),
             name: Some("ImageSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1969),
                     },
                 ],
             },
@@ -25921,17 +25955,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3021, 3136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(874),
+            id: DeclarationId(876),
             name: Some("ContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1971),
                     },
                 ],
             },
@@ -25946,17 +25980,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3138, 3229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(875),
+            id: DeclarationId(877),
             name: Some("AnthropicToolResultContent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -25971,17 +26005,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3505, 3624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(876),
+            id: DeclarationId(878),
             name: Some("AnthropicUserContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1978),
                     },
                 ],
             },
@@ -25996,17 +26030,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3870, 4064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(877),
+            id: DeclarationId(879),
             name: Some("AnthropicAssistantContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1980),
                     },
                 ],
             },
@@ -26021,37 +26055,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4471, 4637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(878),
+            id: DeclarationId(880),
             name: Some("AnthropicStopReason".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1983),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1985),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1986),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1987),
                     },
                 ],
             },
@@ -26066,29 +26100,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4966, 5102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(879),
+            id: DeclarationId(881),
             name: Some("AnthropicMessages200Citation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
@@ -26103,33 +26137,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5304, 6050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(880),
+            id: DeclarationId(882),
             name: Some("AnthropicMessages200ContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2007),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2011),
                     },
                 ],
             },
@@ -26144,41 +26178,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6587, 7115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(881),
+            id: DeclarationId(883),
             name: Some("AnthropicServerToolName".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2015),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2016),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2017),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2019),
                     },
                 ],
             },
@@ -26193,7 +26227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7303, 7485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(882),
+            id: DeclarationId(884),
             name: Some("AnthropicMessages200Usage".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26207,15 +26241,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2020),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2022),
                     },
                 ],
             },
@@ -26230,12 +26264,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7601, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(883),
+            id: DeclarationId(885),
             name: Some("AnthropicMessages200Role".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(2021),
+                    ty: DeclarationId(2023),
                 }],
             },
             type_params: vec![],
@@ -26249,45 +26283,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8159, 8202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(884),
+            id: DeclarationId(886),
             name: Some("AnthropicMessages200Body".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "role".to_string(),
-                        ty: DeclarationId(883),
+                        ty: DeclarationId(885),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "model".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stop_reason".to_string(),
-                        ty: DeclarationId(878),
+                        ty: DeclarationId(880),
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "usage".to_string(),
-                        ty: DeclarationId(882),
+                        ty: DeclarationId(884),
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
@@ -26302,21 +26336,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8549, 8880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(885),
+            id: DeclarationId(887),
             name: Some("BinShim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entrypoint_name".to_string(),
-                        ty: DeclarationId(149),
+                        ty: DeclarationId(151),
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -26331,29 +26365,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(886),
+            id: DeclarationId(888),
             name: Some("BootstrapAuthority".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2028),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2031),
                     },
                 ],
             },
@@ -26368,18 +26402,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(887),
+            id: DeclarationId(889),
             name: Some("BootstrapAuthoritySet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(886),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(888),
                     },
                 ],
             },
@@ -26394,15 +26428,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(888),
+            id: DeclarationId(890),
             name: Some("bootstrap_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(887),
+                template: DeclarationId(889),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(887)),
+            meta_tag: Some(DeclarationId(889)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -26410,441 +26444,441 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2027),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2027),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2027),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2027),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2029),
+                            constructor: DeclarationId(2031),
                             payload: vec![],
                         },
                     ),
@@ -26856,17 +26890,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(889),
+            id: DeclarationId(891),
             name: Some("BridgeStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2033),
                     },
                 ],
             },
@@ -26881,12 +26915,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4697, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(890),
+            id: DeclarationId(892),
             name: Some("BridgeLedgerRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1243),
+                    ty: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -26900,25 +26934,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5699, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(891),
+            id: DeclarationId(893),
             name: Some("BridgeLedgerRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "owner".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "status".to_string(),
-                        ty: DeclarationId(889),
+                        ty: DeclarationId(891),
                     },
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -26932,47 +26966,47 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(892), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(665), arguments: vec![TemplateArgument { parameter: DeclarationId(666), value: DeclarationId(891) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2032)), 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(2031), 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(2030), 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(2030), 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(2030), 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(2030), 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(2030), 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(2031), 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(894), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(667), arguments: vec![TemplateArgument { parameter: DeclarationId(668), value: DeclarationId(893) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2034)), 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(2033), 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(2032), 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(2032), 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(2032), 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(2032), 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(2032), 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(2033), 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(893),
+            id: DeclarationId(895),
             name: Some("CleanEmissionContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expression_wrapping".to_string(),
-                        ty: DeclarationId(895),
+                        ty: DeclarationId(897),
                     },
                     Field {
                         label: "pattern_bindings".to_string(),
-                        ty: DeclarationId(896),
+                        ty: DeclarationId(898),
                     },
                     Field {
                         label: "variant_payload_field_access".to_string(),
-                        ty: DeclarationId(897),
+                        ty: DeclarationId(899),
                     },
                     Field {
                         label: "imports".to_string(),
-                        ty: DeclarationId(898),
+                        ty: DeclarationId(900),
                     },
                     Field {
                         label: "block_return".to_string(),
-                        ty: DeclarationId(899),
+                        ty: DeclarationId(901),
                     },
                     Field {
                         label: "variable_bindings".to_string(),
-                        ty: DeclarationId(900),
+                        ty: DeclarationId(902),
                     },
                     Field {
                         label: "match_arm_body".to_string(),
-                        ty: DeclarationId(901),
+                        ty: DeclarationId(903),
                     },
                     Field {
                         label: "correction_style".to_string(),
-                        ty: DeclarationId(902),
+                        ty: DeclarationId(904),
                     },
                     Field {
                         label: "post_emit_verifier".to_string(),
-                        ty: DeclarationId(903),
+                        ty: DeclarationId(905),
                     },
                 ],
             },
@@ -26987,17 +27021,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(894),
+            id: DeclarationId(896),
             name: Some("TargetCleanEmissionBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1019),
+                        ty: DeclarationId(1021),
                     },
                     Field {
                         label: "clean_emission".to_string(),
-                        ty: DeclarationId(893),
+                        ty: DeclarationId(895),
                     },
                 ],
             },
@@ -27012,21 +27046,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(895),
+            id: DeclarationId(897),
             name: Some("ExpressionWrappingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2037),
                     },
                 ],
             },
@@ -27041,25 +27075,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(896),
+            id: DeclarationId(898),
             name: Some("PatternBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2041),
                     },
                 ],
             },
@@ -27074,17 +27108,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(897),
+            id: DeclarationId(899),
             name: Some("VariantPayloadFieldAccessRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2043),
                     },
                 ],
             },
@@ -27099,21 +27133,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(898),
+            id: DeclarationId(900),
             name: Some("ImportRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2046),
                     },
                 ],
             },
@@ -27128,21 +27162,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(899),
+            id: DeclarationId(901),
             name: Some("BlockReturnRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2049),
                     },
                 ],
             },
@@ -27157,21 +27191,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(900),
+            id: DeclarationId(902),
             name: Some("VariableBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2052),
                     },
                 ],
             },
@@ -27186,21 +27220,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(901),
+            id: DeclarationId(903),
             name: Some("MatchArmBodyRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2055),
                     },
                 ],
             },
@@ -27215,25 +27249,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(902),
+            id: DeclarationId(904),
             name: Some("CorrectionStyle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "indent_unit".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "line_ending".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "string_quote".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "trailing_semicolon".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -27248,21 +27282,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(903),
+            id: DeclarationId(905),
             name: Some("PostEmitVerifier".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "syntax_only".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "expected_exit_code".to_string(),
@@ -27270,7 +27304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "output_policy".to_string(),
-                        ty: DeclarationId(904),
+                        ty: DeclarationId(906),
                     },
                 ],
             },
@@ -27285,25 +27319,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(904),
+            id: DeclarationId(906),
             name: Some("VerifierOutputPolicy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2057),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2058),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2060),
                     },
                 ],
             },
@@ -27318,41 +27352,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(905),
+            id: DeclarationId(907),
             name: Some("SizeBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2066),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(2065),
+                        ty: DeclarationId(2067),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2068),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2069),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2070),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(2069),
+                        ty: DeclarationId(2071),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2072),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(2071),
+                        ty: DeclarationId(2073),
                     },
                 ],
             },
@@ -27367,11 +27401,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1403, 1699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(906),
+            id: DeclarationId(908),
             name: Some("tree_size_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(905),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(907),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     1748,
@@ -27389,41 +27423,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1701, 1779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(907),
+            id: DeclarationId(909),
             name: Some("CallPattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(2072),
+                        ty: DeclarationId(2074),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(2073),
+                        ty: DeclarationId(2075),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(2074),
+                        ty: DeclarationId(2076),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(2075),
+                        ty: DeclarationId(2077),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2078),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(2077),
+                        ty: DeclarationId(2079),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2080),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2081),
                     },
                 ],
             },
@@ -27438,11 +27472,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2030, 2477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(908),
+            id: DeclarationId(910),
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701)],
-                output: DeclarationId(2059),
+                inputs: vec![DeclarationId(809), DeclarationId(703)],
+                output: DeclarationId(2061),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2756,
@@ -27460,21 +27494,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2690, 2786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(909),
+            id: DeclarationId(911),
             name: Some("ShrinkFactor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2082),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2083),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2084),
                     },
                 ],
             },
@@ -27489,21 +27523,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2976, 3116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
+            id: DeclarationId(912),
             name: Some("IterationPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2086),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2087),
                     },
                 ],
             },
@@ -27518,25 +27552,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3278, 3333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
+            id: DeclarationId(913),
             name: Some("LoweringTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "primitive".to_string(),
-                        ty: DeclarationId(910),
+                        ty: DeclarationId(912),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(905),
+                        ty: DeclarationId(907),
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(1162),
+                        ty: DeclarationId(1164),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2088),
                     },
                 ],
             },
@@ -27551,11 +27585,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3525, 3651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
+            id: DeclarationId(914),
             name: Some("lower_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(907)],
-                output: DeclarationId(911),
+                inputs: vec![DeclarationId(909)],
+                output: DeclarationId(913),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     3962,
@@ -27573,11 +27607,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3900, 5513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
+            id: DeclarationId(915),
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(905)],
-                output: DeclarationId(2060),
+                inputs: vec![DeclarationId(907)],
+                output: DeclarationId(2062),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5564,
@@ -27595,11 +27629,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5515, 5989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
+            id: DeclarationId(916),
             name: Some("is_constant_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(905)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(907)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6038,
@@ -27617,7 +27651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5991, 6209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
+            id: DeclarationId(917),
             name: Some("forever_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -27639,11 +27673,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6290, 6349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
+            id: DeclarationId(918),
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(905)],
-                output: DeclarationId(2061),
+                inputs: vec![DeclarationId(907)],
+                output: DeclarationId(2063),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6492,
@@ -27661,21 +27695,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6442, 6757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
+            id: DeclarationId(919),
             name: Some("IterationDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2091),
                     },
                 ],
             },
@@ -27690,11 +27724,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7242, 7425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
+            id: DeclarationId(920),
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(2062),
+                output: DeclarationId(2064),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7558,
@@ -27712,11 +27746,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7478, 8051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
+            id: DeclarationId(921),
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(2063),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(2065),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8123,
@@ -27734,17 +27768,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8053, 8342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(920),
+            id: DeclarationId(922),
             name: Some("Mutability".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2092),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2093),
                     },
                 ],
             },
@@ -27759,17 +27793,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(921),
+            id: DeclarationId(923),
             name: Some("Purity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2094),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2095),
                     },
                 ],
             },
@@ -27784,17 +27818,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
+            id: DeclarationId(924),
             name: Some("Structure".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2097),
                     },
                 ],
             },
@@ -27809,17 +27843,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
+            id: DeclarationId(925),
             name: Some("Iteration".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2098),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2099),
                     },
                 ],
             },
@@ -27834,25 +27868,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
+            id: DeclarationId(926),
             name: Some("ComputationModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "mutability".to_string(),
-                        ty: DeclarationId(920),
+                        ty: DeclarationId(922),
                     },
                     Field {
                         label: "purity".to_string(),
-                        ty: DeclarationId(921),
+                        ty: DeclarationId(923),
                     },
                     Field {
                         label: "structure".to_string(),
-                        ty: DeclarationId(922),
+                        ty: DeclarationId(924),
                     },
                     Field {
                         label: "iteration".to_string(),
-                        ty: DeclarationId(923),
+                        ty: DeclarationId(925),
                     },
                 ],
             },
@@ -27867,15 +27901,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
+            id: DeclarationId(927),
             name: Some("dag_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(924),
+                template: DeclarationId(926),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(924)),
+            meta_tag: Some(DeclarationId(926)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -27883,28 +27917,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2090),
+                            constructor: DeclarationId(2092),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2092),
+                            constructor: DeclarationId(2094),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2094),
+                            constructor: DeclarationId(2096),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2096),
+                            constructor: DeclarationId(2098),
                             payload: vec![],
                         },
                     ),
@@ -27915,25 +27949,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
+            id: DeclarationId(928),
             name: Some("MemoryModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2100),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2103),
                     },
                 ],
             },
@@ -27948,17 +27982,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
+            id: DeclarationId(929),
             name: Some("ScopeModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2105),
                     },
                 ],
             },
@@ -27973,17 +28007,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
+            id: DeclarationId(930),
             name: Some("TargetExecutionModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "memory".to_string(),
-                        ty: DeclarationId(926),
+                        ty: DeclarationId(928),
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(927),
+                        ty: DeclarationId(929),
                     },
                 ],
             },
@@ -27998,12 +28032,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
+            id: DeclarationId(931),
             name: Some("SourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(2104),
+                    ty: DeclarationId(2106),
                 }],
             },
             type_params: vec![],
@@ -28017,17 +28051,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
+            id: DeclarationId(932),
             name: Some("ShapeATargetSourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "internal".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(931),
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2107),
                     },
                 ],
             },
@@ -28042,15 +28076,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
+            id: DeclarationId(933),
             name: Some("internal_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(929),
+                template: DeclarationId(931),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(929)),
+            meta_tag: Some(DeclarationId(931)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28069,17 +28103,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(932),
+            id: DeclarationId(934),
             name: Some("ExecutionModelRequirement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2109),
                     },
                 ],
             },
@@ -28094,10 +28128,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
+            id: DeclarationId(935),
             name: Some("VariantId".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -28111,12 +28145,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
+            id: DeclarationId(936),
             name: Some("WireTagValue".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(2108),
+                    ty: DeclarationId(2110),
                 }],
             },
             type_params: vec![],
@@ -28130,17 +28164,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
+            id: DeclarationId(937),
             name: Some("FieldProjection".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2112),
                     },
                 ],
             },
@@ -28155,17 +28189,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7586, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
+            id: DeclarationId(938),
             name: Some("CoproductVariantProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field_projection".to_string(),
-                        ty: DeclarationId(935),
+                        ty: DeclarationId(937),
                     },
                     Field {
                         label: "wire_tag_value".to_string(),
-                        ty: DeclarationId(934),
+                        ty: DeclarationId(936),
                     },
                 ],
             },
@@ -28180,21 +28214,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 8046, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
+            id: DeclarationId(939),
             name: Some("CoproductProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "declaration".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "wire_tag_field".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2113),
                     },
                 ],
             },
@@ -28209,21 +28243,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
+            id: DeclarationId(940),
             name: Some("ShapeATarget".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Rust".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "Go".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2116),
                     },
                 ],
             },
@@ -28238,33 +28272,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5519, 5557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
+            id: DeclarationId(941),
             name: Some("FormAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2122),
                     },
                 ],
             },
@@ -28279,29 +28313,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6357, 6429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
+            id: DeclarationId(942),
             name: Some("BehaviorAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2127),
                     },
                 ],
             },
@@ -28316,17 +28350,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6989, 7049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
+            id: DeclarationId(943),
             name: Some("MethodTemplateContractKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(938),
+                        ty: DeclarationId(940),
                     },
                     Field {
                         label: "dag_method".to_string(),
-                        ty: DeclarationId(820),
+                        ty: DeclarationId(822),
                     },
                 ],
             },
@@ -28341,17 +28375,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7433, 7514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
+            id: DeclarationId(944),
             name: Some("EmissionCell".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "connective".to_string(),
-                        ty: DeclarationId(939),
+                        ty: DeclarationId(941),
                     },
                     Field {
                         label: "behavior".to_string(),
-                        ty: DeclarationId(940),
+                        ty: DeclarationId(942),
                     },
                 ],
             },
@@ -28366,17 +28400,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7947, 8016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
+            id: DeclarationId(945),
             name: Some("EmissionPathProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "row_identity".to_string(),
-                        ty: DeclarationId(941),
+                        ty: DeclarationId(943),
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2128),
                     },
                 ],
             },
@@ -28391,18 +28425,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8362, 8463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
+            id: DeclarationId(946),
             name: Some("emission_path_projections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(943),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(945),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2127)),
+            meta_tag: Some(DeclarationId(2129)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -28413,87 +28447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(256)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(269)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28501,7 +28455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
+                                    FieldValue::Reference(DeclarationId(258)),
                                 )]),
                             ),
                         ]),
@@ -28512,14 +28466,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28533,7 +28487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28552,14 +28506,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28573,7 +28527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28581,7 +28535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
+                                    FieldValue::Reference(DeclarationId(295)),
                                 )]),
                             ),
                         ]),
@@ -28592,14 +28546,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28613,7 +28567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28621,7 +28575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(260)),
+                                    FieldValue::Reference(DeclarationId(273)),
                                 )]),
                             ),
                         ]),
@@ -28632,14 +28586,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28653,7 +28607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28661,7 +28615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
+                                    FieldValue::Reference(DeclarationId(264)),
                                 )]),
                             ),
                         ]),
@@ -28672,14 +28626,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28693,7 +28647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28701,7 +28655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(261)),
+                                    FieldValue::Reference(DeclarationId(262)),
                                 )]),
                             ),
                         ]),
@@ -28712,14 +28666,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28733,7 +28687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28741,7 +28695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(247)),
+                                    FieldValue::Reference(DeclarationId(252)),
                                 )]),
                             ),
                         ]),
@@ -28752,14 +28706,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28773,7 +28727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28781,7 +28735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(246)),
+                                    FieldValue::Reference(DeclarationId(263)),
                                 )]),
                             ),
                         ]),
@@ -28792,14 +28746,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28813,7 +28767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28821,7 +28775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
+                                    FieldValue::Reference(DeclarationId(249)),
                                 )]),
                             ),
                         ]),
@@ -28832,14 +28786,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28853,7 +28807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28861,7 +28815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(291)),
+                                    FieldValue::Reference(DeclarationId(248)),
                                 )]),
                             ),
                         ]),
@@ -28872,14 +28826,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28893,7 +28847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2112),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28901,7 +28855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
+                                    FieldValue::Reference(DeclarationId(265)),
                                 )]),
                             ),
                         ]),
@@ -28912,14 +28866,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28933,7 +28887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28941,7 +28895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(256)),
+                                    FieldValue::Reference(DeclarationId(293)),
                                 )]),
                             ),
                         ]),
@@ -28952,14 +28906,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -28973,7 +28927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2114),
                                     payload: vec![],
                                 },
                             ),
@@ -28981,7 +28935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(269)),
+                                    FieldValue::Reference(DeclarationId(299)),
                                 )]),
                             ),
                         ]),
@@ -28992,14 +28946,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29013,7 +28967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29021,7 +28975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
+                                    FieldValue::Reference(DeclarationId(258)),
                                 )]),
                             ),
                         ]),
@@ -29032,14 +28986,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29053,7 +29007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29072,14 +29026,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29093,7 +29047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29101,7 +29055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
+                                    FieldValue::Reference(DeclarationId(295)),
                                 )]),
                             ),
                         ]),
@@ -29112,14 +29066,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29133,7 +29087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29141,7 +29095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(260)),
+                                    FieldValue::Reference(DeclarationId(273)),
                                 )]),
                             ),
                         ]),
@@ -29152,14 +29106,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29173,7 +29127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29181,7 +29135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
+                                    FieldValue::Reference(DeclarationId(264)),
                                 )]),
                             ),
                         ]),
@@ -29192,14 +29146,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29213,7 +29167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29221,7 +29175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(261)),
+                                    FieldValue::Reference(DeclarationId(262)),
                                 )]),
                             ),
                         ]),
@@ -29232,14 +29186,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29253,7 +29207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29261,7 +29215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(247)),
+                                    FieldValue::Reference(DeclarationId(252)),
                                 )]),
                             ),
                         ]),
@@ -29272,14 +29226,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29293,7 +29247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29301,7 +29255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(246)),
+                                    FieldValue::Reference(DeclarationId(263)),
                                 )]),
                             ),
                         ]),
@@ -29312,14 +29266,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29333,7 +29287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29341,7 +29295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
+                                    FieldValue::Reference(DeclarationId(249)),
                                 )]),
                             ),
                         ]),
@@ -29352,14 +29306,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29373,7 +29327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29381,7 +29335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(291)),
+                                    FieldValue::Reference(DeclarationId(248)),
                                 )]),
                             ),
                         ]),
@@ -29392,14 +29346,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29413,7 +29367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29421,7 +29375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
+                                    FieldValue::Reference(DeclarationId(265)),
                                 )]),
                             ),
                         ]),
@@ -29432,14 +29386,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29453,7 +29407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29461,7 +29415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(292)),
+                                    FieldValue::Reference(DeclarationId(293)),
                                 )]),
                             ),
                         ]),
@@ -29472,14 +29426,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29493,7 +29447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29501,7 +29455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
+                                    FieldValue::Reference(DeclarationId(299)),
                                 )]),
                             ),
                         ]),
@@ -29512,14 +29466,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29533,7 +29487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2113),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29541,7 +29495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
+                                    FieldValue::Reference(DeclarationId(294)),
                                 )]),
                             ),
                         ]),
@@ -29552,14 +29506,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29573,7 +29527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29581,7 +29535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(256)),
+                                    FieldValue::Reference(DeclarationId(250)),
                                 )]),
                             ),
                         ]),
@@ -29592,14 +29546,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29613,7 +29567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2115),
                                     payload: vec![],
                                 },
                             ),
@@ -29621,7 +29575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(269)),
+                                    FieldValue::Reference(DeclarationId(297)),
                                 )]),
                             ),
                         ]),
@@ -29632,14 +29586,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29653,7 +29607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29661,7 +29615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
+                                    FieldValue::Reference(DeclarationId(258)),
                                 )]),
                             ),
                         ]),
@@ -29672,14 +29626,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29693,7 +29647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29701,7 +29655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(261)),
+                                    FieldValue::Reference(DeclarationId(271)),
                                 )]),
                             ),
                         ]),
@@ -29712,14 +29666,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29733,7 +29687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29741,7 +29695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(247)),
+                                    FieldValue::Reference(DeclarationId(295)),
                                 )]),
                             ),
                         ]),
@@ -29752,14 +29706,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29773,7 +29727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29781,7 +29735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(246)),
+                                    FieldValue::Reference(DeclarationId(263)),
                                 )]),
                             ),
                         ]),
@@ -29792,14 +29746,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29813,7 +29767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29821,7 +29775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
+                                    FieldValue::Reference(DeclarationId(249)),
                                 )]),
                             ),
                         ]),
@@ -29832,14 +29786,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29853,7 +29807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29861,7 +29815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(291)),
+                                    FieldValue::Reference(DeclarationId(248)),
                                 )]),
                             ),
                         ]),
@@ -29872,14 +29826,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29893,7 +29847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29901,7 +29855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
+                                    FieldValue::Reference(DeclarationId(265)),
                                 )]),
                             ),
                         ]),
@@ -29912,14 +29866,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29933,7 +29887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29941,7 +29895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(292)),
+                                    FieldValue::Reference(DeclarationId(293)),
                                 )]),
                             ),
                         ]),
@@ -29952,14 +29906,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -29973,7 +29927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -29981,7 +29935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
+                                    FieldValue::Reference(DeclarationId(299)),
                                 )]),
                             ),
                         ]),
@@ -29992,14 +29946,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -30013,7 +29967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2114),
+                                    constructor: DeclarationId(2116),
                                     payload: vec![],
                                 },
                             ),
@@ -30021,7 +29975,87 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
+                                    FieldValue::Reference(DeclarationId(294)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2121),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2124),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2116),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "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(2121),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2124),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2116),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(297)),
                                 )]),
                             ),
                         ]),
@@ -30032,14 +30066,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2119),
+                                    constructor: DeclarationId(2121),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2122),
+                                    constructor: DeclarationId(2124),
                                     payload: vec![],
                                 },
                             ),
@@ -30052,49 +30086,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8884, 14433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
+            id: DeclarationId(947),
             name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2139),
                     },
                 ],
             },
@@ -30109,21 +30143,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
+            id: DeclarationId(948),
             name: Some("Correction".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "new_source".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -30138,17 +30172,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1435, 1688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
+            id: DeclarationId(949),
             name: Some("DiagnosticKindDecl".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(758),
+                        ty: DeclarationId(760),
                     },
                 ],
             },
@@ -30163,12 +30197,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 2468, 2531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(948),
+            id: DeclarationId(950),
             name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1243),
+                    ty: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -30182,17 +30216,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 4733, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
+            id: DeclarationId(951),
             name: Some("AnyDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2141),
                     },
                 ],
             },
@@ -30207,25 +30241,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5402, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
+            id: DeclarationId(952),
             name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(949),
+                        ty: DeclarationId(951),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "message".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2142),
                     },
                 ],
             },
@@ -30240,37 +30274,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5880, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(951),
+            id: DeclarationId(953),
             name: Some("EmissionDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2150),
                     },
                 ],
             },
@@ -30285,21 +30319,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 8622, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(952),
+            id: DeclarationId(954),
             name: Some("Witness".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2166),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(953)],
+            type_params: vec![DeclarationId(955)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30310,7 +30344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(953),
+            id: DeclarationId(955),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30324,17 +30358,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(954),
+            id: DeclarationId(956),
             name: Some("OptionalDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2168),
                     },
                 ],
             },
@@ -30349,21 +30383,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(955),
+            id: DeclarationId(957),
             name: Some("DimensionReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2175),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(956)],
+            type_params: vec![DeclarationId(958)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30374,7 +30408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(956),
+            id: DeclarationId(958),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30388,29 +30422,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(957),
+            id: DeclarationId(959),
             name: Some("AnalysisDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2179),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(958)],
+            type_params: vec![DeclarationId(960)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30421,7 +30455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(958),
+            id: DeclarationId(960),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30435,18 +30469,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(959),
+            id: DeclarationId(961),
             name: Some("Dimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(961),
+                    ty: DeclarationId(963),
                 }],
             },
-            type_params: vec![DeclarationId(960), DeclarationId(961)],
+            type_params: vec![DeclarationId(962), DeclarationId(963)],
             phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(960),
-                algebra: DeclarationId(2178),
+                parameter: DeclarationId(962),
+                algebra: DeclarationId(2180),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -30457,7 +30491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(960),
+            id: DeclarationId(962),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30471,7 +30505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
+            id: DeclarationId(963),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30485,7 +30519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
+            id: DeclarationId(964),
             name: Some("Meters".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30499,7 +30533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
+            id: DeclarationId(965),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30513,7 +30547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
+            id: DeclarationId(966),
             name: Some("Kilograms".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30527,7 +30561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
+            id: DeclarationId(967),
             name: Some("Amperes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30541,7 +30575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
+            id: DeclarationId(968),
             name: Some("Kelvin".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30555,7 +30589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
+            id: DeclarationId(969),
             name: Some("Moles".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30569,7 +30603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
+            id: DeclarationId(970),
             name: Some("Candela".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30583,18 +30617,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(969),
+            id: DeclarationId(971),
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2149),
-                    DeclarationId(2150),
                     DeclarationId(2151),
+                    DeclarationId(2152),
+                    DeclarationId(2153),
                 ],
-                output: DeclarationId(2152),
+                output: DeclarationId(2154),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
-            type_params: vec![DeclarationId(970), DeclarationId(971)],
+            type_params: vec![DeclarationId(972), DeclarationId(973)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30605,7 +30639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(970),
+            id: DeclarationId(972),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30619,7 +30653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(971),
+            id: DeclarationId(973),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30633,18 +30667,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
+            id: DeclarationId(974),
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2153),
-                    DeclarationId(2154),
                     DeclarationId(2155),
+                    DeclarationId(2156),
+                    DeclarationId(2157),
                 ],
-                output: DeclarationId(2156),
+                output: DeclarationId(2158),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
-            type_params: vec![DeclarationId(973), DeclarationId(974)],
+            type_params: vec![DeclarationId(975), DeclarationId(976)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30655,7 +30689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
+            id: DeclarationId(975),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30669,7 +30703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
+            id: DeclarationId(976),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30683,14 +30717,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
+            id: DeclarationId(977),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2157), DeclarationId(2158), DeclarationId(977)],
-                output: DeclarationId(2159),
+                inputs: vec![DeclarationId(2159), DeclarationId(2160), DeclarationId(979)],
+                output: DeclarationId(2161),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
-            type_params: vec![DeclarationId(976), DeclarationId(977)],
+            type_params: vec![DeclarationId(978), DeclarationId(979)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30701,7 +30735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
+            id: DeclarationId(978),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30715,7 +30749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(977),
+            id: DeclarationId(979),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30729,14 +30763,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(978),
+            id: DeclarationId(980),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2160), DeclarationId(2161), DeclarationId(980)],
-                output: DeclarationId(2162),
+                inputs: vec![DeclarationId(2162), DeclarationId(2163), DeclarationId(982)],
+                output: DeclarationId(2164),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![DeclarationId(979), DeclarationId(980)],
+            type_params: vec![DeclarationId(981), DeclarationId(982)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30747,7 +30781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(979),
+            id: DeclarationId(981),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30761,7 +30795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(980),
+            id: DeclarationId(982),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30775,10 +30809,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
+            id: DeclarationId(983),
             name: Some("EmissionRule".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -30792,17 +30826,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 2797, 2823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
+            id: DeclarationId(984),
             name: Some("OptionalSourceSpan".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2182),
                     },
                 ],
             },
@@ -30817,7 +30851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3681, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(983),
+            id: DeclarationId(985),
             name: Some("EmissionProvenance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30827,11 +30861,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rule".to_string(),
-                        ty: DeclarationId(981),
+                        ty: DeclarationId(983),
                     },
                     Field {
                         label: "source_span".to_string(),
-                        ty: DeclarationId(982),
+                        ty: DeclarationId(984),
                     },
                 ],
             },
@@ -30846,29 +30880,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 4898, 5008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
+            id: DeclarationId(986),
             name: Some("TypeRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "is_copy".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -30887,29 +30921,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(985),
+            id: DeclarationId(987),
             name: Some("TargetIntegerTypeInhabitance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(986),
+                        ty: DeclarationId(988),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -30924,21 +30958,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 2385, 2840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(986),
+            id: DeclarationId(988),
             name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2186),
                     },
                 ],
             },
@@ -30953,21 +30987,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4334, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(987),
+            id: DeclarationId(989),
             name: Some("FieldBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dag_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "access".to_string(),
-                        ty: DeclarationId(988),
+                        ty: DeclarationId(990),
                     },
                     Field {
                         label: "borrowed_read".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -30982,17 +31016,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4688, 4772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(988),
+            id: DeclarationId(990),
             name: Some("FieldAccess".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2188),
                     },
                 ],
             },
@@ -31007,25 +31041,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5155, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
+            id: DeclarationId(991),
             name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31044,21 +31078,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(990),
+            id: DeclarationId(992),
             name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31077,25 +31111,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5357, 5467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(991),
+            id: DeclarationId(993),
             name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1002),
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31114,7 +31148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5469, 5628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(992),
+            id: DeclarationId(994),
             name: Some("CallableParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -31124,7 +31158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "disposition".to_string(),
-                        ty: DeclarationId(993),
+                        ty: DeclarationId(995),
                     },
                 ],
             },
@@ -31139,17 +31173,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6050, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(993),
+            id: DeclarationId(995),
             name: Some("ParameterDisposition".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2191),
                     },
                 ],
             },
@@ -31164,17 +31198,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6581, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(994),
+            id: DeclarationId(996),
             name: Some("StringOwnershipAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2193),
                     },
                 ],
             },
@@ -31189,17 +31223,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7044, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(995),
+            id: DeclarationId(997),
             name: Some("StringLifetimeAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2195),
                     },
                 ],
             },
@@ -31214,21 +31248,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7399, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(996),
+            id: DeclarationId(998),
             name: Some("StringGrowabilityAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2198),
                     },
                 ],
             },
@@ -31243,12 +31277,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7678, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(997),
+            id: DeclarationId(999),
             name: Some("StringEncodingAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2197),
+                    ty: DeclarationId(2199),
                 }],
             },
             type_params: vec![],
@@ -31262,37 +31296,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8054, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(998),
+            id: DeclarationId(1000),
             name: Some("StringFamilyInhabitanceRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target_type".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "ownership".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "lifetime".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "growability".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "encoding".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -31307,21 +31341,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8684, 8923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(999),
+            id: DeclarationId(1001),
             name: Some("TypeInstantiationRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31340,49 +31374,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8925, 9044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1000),
+            id: DeclarationId(1002),
             name: Some("CallableStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2209),
                     },
                 ],
             },
@@ -31397,49 +31431,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9449, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1001),
+            id: DeclarationId(1003),
             name: Some("PatternRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1002),
+                        ty: DeclarationId(1004),
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "scrutinee".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "empty_pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cons_pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "head_expr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "tail_expr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31458,17 +31492,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11557, 11846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1002),
+            id: DeclarationId(1004),
             name: Some("PatternStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2211),
                     },
                 ],
             },
@@ -31483,17 +31517,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12286, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1003),
+            id: DeclarationId(1005),
             name: Some("StatementSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "let_binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "let_binding_inferred".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31508,21 +31542,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12354, 12431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1004),
+            id: DeclarationId(1006),
             name: Some("ExpressionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field_access".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "function_call".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "closure".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31537,17 +31571,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12433, 12523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1005),
+            id: DeclarationId(1007),
             name: Some("ForEachSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "prefix".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31562,21 +31596,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12525, 12584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1006),
+            id: DeclarationId(1008),
             name: Some("ControlFlowSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "if_else".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "match_arm".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(1005),
+                        ty: DeclarationId(1007),
                     },
                 ],
             },
@@ -31591,21 +31625,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12586, 12683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1007),
+            id: DeclarationId(1009),
             name: Some("LiteralSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "true_keyword".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "false_keyword".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "string_delimiter".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31620,12 +31654,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12685, 12781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1008),
+            id: DeclarationId(1010),
             name: Some("ModuleSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "path_separator".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -31639,29 +31673,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12783, 12829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
+            id: DeclarationId(1011),
             name: Some("FunctionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "definition".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "definition_exported".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "definition_void".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "param_with_type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "param_separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31676,12 +31710,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12831, 12983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
+            id: DeclarationId(1012),
             name: Some("TypeApplicationSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "optional".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -31695,29 +31729,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12985, 13034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
+            id: DeclarationId(1013),
             name: Some("TypeDefinitionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "struct_def".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "struct_field".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_def".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_unit_variant".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_data_variant".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31732,17 +31766,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13248, 13396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
+            id: DeclarationId(1014),
             name: Some("RecordDeriveTemplateBundle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "struct_def_no_debug".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_def_no_debug".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31757,41 +31791,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14057, 14150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
+            id: DeclarationId(1015),
             name: Some("PatternMatchSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "match_expr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "match_arm".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_pattern_positional".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_pattern_empty".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "field_binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "field_binding_separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "wildcard".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31806,65 +31840,65 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14854, 15094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1014),
+            id: DeclarationId(1016),
             name: Some("CollectionOps".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "concat_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "length_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "fold_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "filter_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "any_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "all_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "map_contract".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "filter".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "contains".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "empty_list".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "list_literal".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cons".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31879,29 +31913,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15096, 16332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1015),
+            id: DeclarationId(1017),
             name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "struct_literal".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "struct_field_init".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "struct_field_separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_construction".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_named_construction".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31916,17 +31950,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16334, 16520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1016),
+            id: DeclarationId(1018),
             name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(1017),
+                        ty: DeclarationId(1019),
                     },
                     Field {
                         label: "construct".to_string(),
-                        ty: DeclarationId(1018),
+                        ty: DeclarationId(1020),
                     },
                 ],
             },
@@ -31941,17 +31975,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16522, 16597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1017),
+            id: DeclarationId(1019),
             name: Some("ReadStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2213),
                     },
                 ],
             },
@@ -31966,17 +32000,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1018),
+            id: DeclarationId(1020),
             name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2215),
                     },
                 ],
             },
@@ -31991,57 +32025,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17432, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
+            id: DeclarationId(1021),
             name: Some("LanguageSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -32056,17 +32090,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17488, 18014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1020),
+            id: DeclarationId(1022),
             name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2217),
                     },
                 ],
             },
@@ -32081,17 +32115,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19388, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1021),
+            id: DeclarationId(1023),
             name: Some("MethodEmitTemplate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2219),
                     },
                 ],
             },
@@ -32106,29 +32140,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20578, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
+            id: DeclarationId(1024),
             name: Some("MethodTemplateContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dag_method".to_string(),
-                        ty: DeclarationId(820),
+                        ty: DeclarationId(822),
                     },
                     Field {
                         label: "runtime_template".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "emit_template".to_string(),
-                        ty: DeclarationId(1021),
+                        ty: DeclarationId(1023),
                     },
                     Field {
                         label: "wraps_result".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(1020),
+                        ty: DeclarationId(1022),
                     },
                 ],
             },
@@ -32143,12 +32177,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1023),
+            id: DeclarationId(1025),
             name: Some("BootstrapFixture".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "virtual_path".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -32162,33 +32196,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
+            id: DeclarationId(1026),
             name: Some("BootstrapFixtureSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "cross_target_coverage".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                 ],
             },
@@ -32203,15 +32237,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1025),
+            id: DeclarationId(1027),
             name: Some("bootstrap_fixture_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1024),
+                template: DeclarationId(1026),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1024)),
+            meta_tag: Some(DeclarationId(1026)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32277,15 +32311,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1908, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1026),
+            id: DeclarationId(1028),
             name: Some("go_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32294,7 +32328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(254)),
+                            FieldValue::Reference(DeclarationId(256)),
                         )]),
                     ),
                     (
@@ -32306,7 +32340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -32319,7 +32353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32330,15 +32364,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(1027),
+            id: DeclarationId(1029),
             name: Some("go_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32347,7 +32381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(272)),
+                            FieldValue::Reference(DeclarationId(274)),
                         )]),
                     ),
                     (
@@ -32357,7 +32391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -32370,7 +32404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32381,15 +32415,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(1028),
+            id: DeclarationId(1030),
             name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32398,7 +32432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(268)),
+                            FieldValue::Reference(DeclarationId(270)),
                         )]),
                     ),
                     (
@@ -32408,7 +32442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -32421,7 +32455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32432,15 +32466,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(1029),
+            id: DeclarationId(1031),
             name: Some("go_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32449,7 +32483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(264)),
+                            FieldValue::Reference(DeclarationId(266)),
                         )]),
                     ),
                     (
@@ -32461,7 +32495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -32474,7 +32508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32485,15 +32519,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(1030),
+            id: DeclarationId(1032),
             name: Some("go_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32502,7 +32536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(275)),
+                            FieldValue::Reference(DeclarationId(277)),
                         )]),
                     ),
                     (
@@ -32514,7 +32548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -32527,7 +32561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32538,15 +32572,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(1031),
+            id: DeclarationId(1033),
             name: Some("go_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32555,7 +32589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(261)),
+                            FieldValue::Reference(DeclarationId(263)),
                         )]),
                     ),
                     (
@@ -32567,7 +32601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -32580,7 +32614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32591,15 +32625,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(1032),
+            id: DeclarationId(1034),
             name: Some("go_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32608,7 +32642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(247)),
+                            FieldValue::Reference(DeclarationId(249)),
                         )]),
                     ),
                     (
@@ -32620,7 +32654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -32633,7 +32667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32644,15 +32678,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(1033),
+            id: DeclarationId(1035),
             name: Some("go_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32661,7 +32695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(246)),
+                            FieldValue::Reference(DeclarationId(248)),
                         )]),
                     ),
                     (
@@ -32673,7 +32707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -32686,7 +32720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32697,15 +32731,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(1034),
+            id: DeclarationId(1036),
             name: Some("go_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32714,7 +32748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(263)),
+                            FieldValue::Reference(DeclarationId(265)),
                         )]),
                     ),
                     (
@@ -32726,7 +32760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -32739,7 +32773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32750,18 +32784,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(1035),
+            id: DeclarationId(1037),
             name: Some("go_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2218)),
+            meta_tag: Some(DeclarationId(2220)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -32770,7 +32804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(256)),
+                            FieldValue::Reference(DeclarationId(258)),
                         )]),
                     ),
                     (
@@ -32780,7 +32814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -32793,7 +32827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32803,7 +32837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(269)),
+                            FieldValue::Reference(DeclarationId(271)),
                         )]),
                     ),
                     (
@@ -32815,7 +32849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -32828,7 +32862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32838,7 +32872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(293)),
+                            FieldValue::Reference(DeclarationId(295)),
                         )]),
                     ),
                     (
@@ -32850,7 +32884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -32863,21 +32897,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(1031)),
-                FieldValue::Reference(DeclarationId(1032)),
                 FieldValue::Reference(DeclarationId(1033)),
                 FieldValue::Reference(DeclarationId(1034)),
+                FieldValue::Reference(DeclarationId(1035)),
+                FieldValue::Reference(DeclarationId(1036)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(291)),
+                            FieldValue::Reference(DeclarationId(293)),
                         )]),
                     ),
                     (
@@ -32887,7 +32921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -32900,7 +32934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32910,7 +32944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(297)),
+                            FieldValue::Reference(DeclarationId(299)),
                         )]),
                     ),
                     (
@@ -32920,7 +32954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -32933,7 +32967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32943,7 +32977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(292)),
+                            FieldValue::Reference(DeclarationId(294)),
                         )]),
                     ),
                     (
@@ -32955,7 +32989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -32968,7 +33002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -32978,7 +33012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(248)),
+                            FieldValue::Reference(DeclarationId(250)),
                         )]),
                     ),
                     (
@@ -32990,7 +33024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -33003,7 +33037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -33013,7 +33047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(295)),
+                            FieldValue::Reference(DeclarationId(297)),
                         )]),
                     ),
                     (
@@ -33025,7 +33059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -33038,7 +33072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -33049,29 +33083,29 @@ 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(1036),
+            id: DeclarationId(1038),
             name: Some("RecursionShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2238),
                     },
                 ],
             },
@@ -33086,29 +33120,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5605, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
+            id: DeclarationId(1039),
             name: Some("InductiveField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "type_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "field_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(1036),
+                        ty: DeclarationId(1038),
                     },
                     Field {
                         label: "element_type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -33123,11 +33157,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7170, 7592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
+            id: DeclarationId(1040),
             name: Some("recursion_shape_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1036), DeclarationId(1036)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1038), DeclarationId(1038)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)),
             },
             type_params: vec![],
@@ -33141,11 +33175,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7594, 8034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
+            id: DeclarationId(1041),
             name: Some("inductive_field_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1037), DeclarationId(1037)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1039), DeclarationId(1039)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)),
             },
             type_params: vec![],
@@ -33159,11 +33193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 8036, 8302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
+            id: DeclarationId(1042),
             name: Some("inductive_field_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1037), DeclarationId(228)],
-                output: DeclarationId(1169),
+                inputs: vec![DeclarationId(1039), DeclarationId(230)],
+                output: DeclarationId(1171),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)),
             },
             type_params: vec![],
@@ -33177,29 +33211,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 8678, 8799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
+            id: DeclarationId(1043),
             name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2243),
                     },
                 ],
             },
@@ -33214,11 +33248,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9945, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
+            id: DeclarationId(1044),
             name: Some("sub_value_to_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041)],
-                output: DeclarationId(1162),
+                inputs: vec![DeclarationId(1043)],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     11134,
@@ -33236,11 +33270,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 11062, 11737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1043),
+            id: DeclarationId(1045),
             name: Some("shrink_factor_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(909), DeclarationId(909)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(911), DeclarationId(911)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     12205,
@@ -33258,11 +33292,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 12143, 12691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1044),
+            id: DeclarationId(1046),
             name: Some("meet_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1041)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1043)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     13282,
@@ -33280,11 +33314,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 13202, 14694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1045),
+            id: DeclarationId(1047),
             name: Some("join_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1041)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1043)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     15026,
@@ -33302,11 +33336,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 14946, 16329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1046),
+            id: DeclarationId(1048),
             name: Some("compose_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1037)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1039)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     17472,
@@ -33324,11 +33358,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 17384, 17594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1047),
+            id: DeclarationId(1049),
             name: Some("compose_sub_value_relations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1041)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1043)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     18450,
@@ -33346,11 +33380,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 18342, 19796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1048),
+            id: DeclarationId(1050),
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041)],
-                output: DeclarationId(2219),
+                inputs: vec![DeclarationId(1043)],
+                output: DeclarationId(2221),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -33368,11 +33402,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20498, 21367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
+            id: DeclarationId(1051),
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041)],
-                output: DeclarationId(2220),
+                inputs: vec![DeclarationId(1043)],
+                output: DeclarationId(2222),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -33390,25 +33424,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21880, 22864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
+            id: DeclarationId(1052),
             name: Some("PolynomialExponent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2247),
                     },
                 ],
             },
@@ -33423,11 +33457,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24107, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1051),
+            id: DeclarationId(1053),
             name: Some("poly_exp_degree_one".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1050),
+                output: DeclarationId(1052),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     24411,
@@ -33445,17 +33479,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24364, 24450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
+            id: DeclarationId(1054),
             name: Some("AtomicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2249),
                     },
                 ],
             },
@@ -33470,37 +33504,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24962, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
+            id: DeclarationId(1055),
             name: Some("CostBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2260),
                     },
                 ],
             },
@@ -33515,11 +33549,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26709, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
+            id: DeclarationId(1056),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2221)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(2223)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     27880,
@@ -33537,11 +33571,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27830, 27986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
+            id: DeclarationId(1057),
             name: Some("cost_bound_is_sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1053)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1055)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28310,
@@ -33559,11 +33593,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
+            id: DeclarationId(1058),
             name: Some("cost_bound_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1053)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1055)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(406))),
             },
             type_params: vec![],
@@ -33577,11 +33611,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1057),
+            id: DeclarationId(1059),
             name: Some("atomic_cost_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1052)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1054)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(415))),
             },
             type_params: vec![],
@@ -33595,11 +33629,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29519, 29839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1058),
+            id: DeclarationId(1060),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2222)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(2224)],
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29913,
@@ -33617,11 +33651,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1059),
+            id: DeclarationId(1061),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2223)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(2225)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(417))),
             },
             type_params: vec![],
@@ -33635,11 +33669,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1060),
+            id: DeclarationId(1062),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2225)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(2227)],
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30137,
@@ -33657,11 +33691,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1061),
+            id: DeclarationId(1063),
             name: Some("cost_constant".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30206,
@@ -33679,11 +33713,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1062),
+            id: DeclarationId(1064),
             name: Some("cost_linear".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30267,
@@ -33701,11 +33735,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1063),
+            id: DeclarationId(1065),
             name: Some("cost_poly".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30406,
@@ -33723,11 +33757,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
+            id: DeclarationId(1066),
             name: Some("cost_root".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30855,
@@ -33745,11 +33779,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30806, 31129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
+            id: DeclarationId(1067),
             name: Some("cost_sqrt".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31171,
@@ -33767,11 +33801,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31130, 31204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
+            id: DeclarationId(1068),
             name: Some("cost_cbrt".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31246,
@@ -33789,11 +33823,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31205, 31279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
+            id: DeclarationId(1069),
             name: Some("cost_log".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31320,
@@ -33811,11 +33845,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31280, 31370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
+            id: DeclarationId(1070),
             name: Some("cost_nlogn".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31414,
@@ -33833,11 +33867,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31372, 31532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1069),
+            id: DeclarationId(1071),
             name: Some("cost_graph_linear".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31602,
@@ -33855,13 +33889,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31534, 31778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1070),
+            id: DeclarationId(1072),
             name: Some("RecurrenceForm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "branches".to_string(),
@@ -33888,11 +33922,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 32935, 33026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1071),
+            id: DeclarationId(1073),
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2226),
+                output: DeclarationId(2228),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -33910,11 +33944,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33574, 33868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1072),
+            id: DeclarationId(1074),
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2227),
+                output: DeclarationId(2229),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -33932,11 +33966,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33870, 34702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1073),
+            id: DeclarationId(1075),
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2228),
+                output: DeclarationId(2230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -33954,11 +33988,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35118, 35285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1074),
+            id: DeclarationId(1076),
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2229),
+                output: DeclarationId(2231),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -33976,11 +34010,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35589, 36682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
+            id: DeclarationId(1077),
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2230),
+                output: DeclarationId(2232),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -33998,7 +34032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36854, 37015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
+            id: DeclarationId(1078),
             name: Some("ceil_log_iter".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -34007,7 +34041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(2231),
+                output: DeclarationId(2233),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -34025,11 +34059,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37101, 37534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1077),
+            id: DeclarationId(1079),
             name: Some("master_theorem".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1070)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(1072)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37589,
@@ -34047,11 +34081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37536, 39626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1078),
+            id: DeclarationId(1080),
             name: Some("catamorphism_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     39979,
@@ -34069,16 +34103,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 39909, 40137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1079),
+            id: DeclarationId(1081),
             name: Some("derive_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(228),
+                    DeclarationId(230),
                     DeclarationId(93),
-                    DeclarationId(909),
+                    DeclarationId(911),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40636,
@@ -34096,11 +34130,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40535, 41660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1080),
+            id: DeclarationId(1082),
             name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41993,
@@ -34118,11 +34152,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41954, 42050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1081),
+            id: DeclarationId(1083),
             name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42093,
@@ -34140,11 +34174,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42052, 42151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1082),
+            id: DeclarationId(1084),
             name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42251,
@@ -34162,11 +34196,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42215, 42306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1083),
+            id: DeclarationId(1085),
             name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42503,
@@ -34184,11 +34218,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42465, 42618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1084),
+            id: DeclarationId(1086),
             name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42698,
@@ -34206,11 +34240,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42664, 42813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1085),
+            id: DeclarationId(1087),
             name: Some("karatsuba_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42980,
@@ -34228,11 +34262,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1086),
+            id: DeclarationId(1088),
             name: Some("strassen_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43264,
@@ -34250,11 +34284,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1087),
+            id: DeclarationId(1089),
             name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43495,
@@ -34272,11 +34306,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1088),
+            id: DeclarationId(1090),
             name: Some("cube_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43555,
@@ -34294,11 +34328,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
+            id: DeclarationId(1091),
             name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43662,
@@ -34316,11 +34350,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
+            id: DeclarationId(1092),
             name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43929,
@@ -34338,11 +34372,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
+            id: DeclarationId(1093),
             name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     44071,
@@ -34360,11 +34394,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
+            id: DeclarationId(1094),
             name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     44456,
@@ -34382,11 +34416,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
+            id: DeclarationId(1095),
             name: Some("floyd_warshall_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     44723,
@@ -34404,18 +34438,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 44684, 44761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
+            id: DeclarationId(1096),
             name: Some("signed_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1243),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2259)),
+            meta_tag: Some(DeclarationId(2261)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -34430,18 +34464,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
+            id: DeclarationId(1097),
             name: Some("unsigned_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1243),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2260)),
+            meta_tag: Some(DeclarationId(2262)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -34456,37 +34490,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
+            id: DeclarationId(1098),
             name: Some("Lens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2268),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1097)],
+            type_params: vec![DeclarationId(1099)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34497,7 +34531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
+            id: DeclarationId(1099),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
@@ -34511,17 +34545,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
+            id: DeclarationId(1100),
             name: Some("SectionRef".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2270),
                     },
                 ],
             },
@@ -34536,12 +34570,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3285, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1099),
+            id: DeclarationId(1101),
             name: Some("DiagnosticSeverity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2269),
+                    ty: DeclarationId(2271),
                 }],
             },
             type_params: vec![],
@@ -34555,21 +34589,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4271, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1100),
+            id: DeclarationId(1102),
             name: Some("LensEnforcement".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2273),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1101), DeclarationId(1102)],
+            type_params: vec![DeclarationId(1103), DeclarationId(1104)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34580,7 +34614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1101),
+            id: DeclarationId(1103),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34594,7 +34628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1102),
+            id: DeclarationId(1104),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
@@ -34608,21 +34642,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1103),
+            id: DeclarationId(1105),
             name: Some("EnforceableLens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2275),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1104), DeclarationId(1105)],
+            type_params: vec![DeclarationId(1106), DeclarationId(1107)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34633,7 +34667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1104),
+            id: DeclarationId(1106),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34647,7 +34681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1105),
+            id: DeclarationId(1107),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
@@ -34661,33 +34695,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
+            id: DeclarationId(1108),
             name: Some("EnforcedApplication".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "section".to_string(),
-                        ty: DeclarationId(1098),
+                        ty: DeclarationId(1100),
                     },
                     Field {
                         label: "budget".to_string(),
-                        ty: DeclarationId(1108),
+                        ty: DeclarationId(1110),
                     },
                     Field {
                         label: "diagnostic_severity".to_string(),
-                        ty: DeclarationId(1099),
+                        ty: DeclarationId(1101),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1107), DeclarationId(1108)],
+            type_params: vec![DeclarationId(1109), DeclarationId(1110)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34698,7 +34732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
+            id: DeclarationId(1109),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34712,7 +34746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
+            id: DeclarationId(1110),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
@@ -34726,25 +34760,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
+            id: DeclarationId(1111),
             name: Some("IntrospectApplication".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "section".to_string(),
-                        ty: DeclarationId(1098),
+                        ty: DeclarationId(1100),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1110)],
+            type_params: vec![DeclarationId(1112)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34755,7 +34789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
+            id: DeclarationId(1112),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34769,21 +34803,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
+            id: DeclarationId(1113),
             name: Some("Lookup".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2281),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1112)],
+            type_params: vec![DeclarationId(1114)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34794,7 +34828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
+            id: DeclarationId(1114),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -34808,11 +34842,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
+            id: DeclarationId(1115),
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2276),
+                output: DeclarationId(2278),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -34826,11 +34860,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
+            id: DeclarationId(1116),
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2277),
+                output: DeclarationId(2279),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -34844,12 +34878,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
+            id: DeclarationId(1117),
             name: Some("DagDifference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "detail".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -34863,12 +34897,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 684, 723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
+            id: DeclarationId(1118),
             name: Some("SurfaceModule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(2280),
+                    ty: DeclarationId(2282),
                 }],
             },
             type_params: vec![],
@@ -34882,21 +34916,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1149, 1198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
+            id: DeclarationId(1119),
             name: Some("SurfaceParam".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2283),
                     },
                 ],
             },
@@ -34911,17 +34945,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1200, 1281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
+            id: DeclarationId(1120),
             name: Some("SurfaceField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                 ],
             },
@@ -34936,21 +34970,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1283, 1337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
+            id: DeclarationId(1121),
             name: Some("SurfaceVariant".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1122),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -34965,17 +34999,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1339, 1422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
+            id: DeclarationId(1122),
             name: Some("VariantPayload".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2287),
                     },
                 ],
             },
@@ -34990,25 +35024,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1712, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
+            id: DeclarationId(1123),
             name: Some("SurfaceType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2293),
                     },
                 ],
             },
@@ -35023,21 +35057,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2052, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
+            id: DeclarationId(1124),
             name: Some("SurfaceRecordField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -35052,25 +35086,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2381, 2463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
+            id: DeclarationId(1125),
             name: Some("SurfaceMapEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "key".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "key_span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -35085,21 +35119,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3353, 3454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
+            id: DeclarationId(1126),
             name: Some("SurfaceMatchArm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "pattern".to_string(),
-                        ty: DeclarationId(1126),
+                        ty: DeclarationId(1128),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -35114,21 +35148,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3456, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
+            id: DeclarationId(1127),
             name: Some("SurfacePatternField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -35143,21 +35177,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3547, 3627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1126),
+            id: DeclarationId(1128),
             name: Some("SurfacePattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2294),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2297),
                     },
                 ],
             },
@@ -35172,21 +35206,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3725, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1127),
+            id: DeclarationId(1129),
             name: Some("SurfaceLiteral".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2299),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2300),
                     },
                 ],
             },
@@ -35201,61 +35235,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4639, 4708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
+            id: DeclarationId(1130),
             name: Some("SurfaceExpr".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2301),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2305),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "PathCall".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2311),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2322),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2324),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2326),
                     },
                 ],
             },
@@ -35270,49 +35304,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4801, 8620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1129),
+            id: DeclarationId(1131),
             name: Some("SurfaceItem".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2328),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2353),
                     },
                 ],
             },
@@ -35327,15 +35361,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9489, 10807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1130),
+            id: DeclarationId(1132),
             name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35344,7 +35378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(254)),
+                            FieldValue::Reference(DeclarationId(256)),
                         )]),
                     ),
                     (
@@ -35354,7 +35388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -35367,7 +35401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35382,15 +35416,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1131),
+            id: DeclarationId(1133),
             name: Some("python_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35399,7 +35433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(272)),
+                            FieldValue::Reference(DeclarationId(274)),
                         )]),
                     ),
                     (
@@ -35409,7 +35443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35422,7 +35456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35437,15 +35471,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1132),
+            id: DeclarationId(1134),
             name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35454,7 +35488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(268)),
+                            FieldValue::Reference(DeclarationId(270)),
                         )]),
                     ),
                     (
@@ -35464,7 +35498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -35477,7 +35511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35492,15 +35526,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1133),
+            id: DeclarationId(1135),
             name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35509,7 +35543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(264)),
+                            FieldValue::Reference(DeclarationId(266)),
                         )]),
                     ),
                     (
@@ -35521,7 +35555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -35534,7 +35568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35549,15 +35583,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
+            id: DeclarationId(1136),
             name: Some("python_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35566,7 +35600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(275)),
+                            FieldValue::Reference(DeclarationId(277)),
                         )]),
                     ),
                     (
@@ -35578,7 +35612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -35591,7 +35625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35606,15 +35640,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
+            id: DeclarationId(1137),
             name: Some("python_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35623,7 +35657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(261)),
+                            FieldValue::Reference(DeclarationId(263)),
                         )]),
                     ),
                     (
@@ -35635,7 +35669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -35648,7 +35682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35663,15 +35697,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1136),
+            id: DeclarationId(1138),
             name: Some("python_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35680,7 +35714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(247)),
+                            FieldValue::Reference(DeclarationId(249)),
                         )]),
                     ),
                     (
@@ -35692,7 +35726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -35705,7 +35739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35720,15 +35754,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
+            id: DeclarationId(1139),
             name: Some("python_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35737,7 +35771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(246)),
+                            FieldValue::Reference(DeclarationId(248)),
                         )]),
                     ),
                     (
@@ -35749,7 +35783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -35762,7 +35796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35777,15 +35811,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1138),
+            id: DeclarationId(1140),
             name: Some("python_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35794,7 +35828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(263)),
+                            FieldValue::Reference(DeclarationId(265)),
                         )]),
                     ),
                     (
@@ -35806,7 +35840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -35819,7 +35853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35834,18 +35868,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1139),
+            id: DeclarationId(1141),
             name: Some("python_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2352)),
+            meta_tag: Some(DeclarationId(2354)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35854,7 +35888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(256)),
+                            FieldValue::Reference(DeclarationId(258)),
                         )]),
                     ),
                     (
@@ -35864,7 +35898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35877,7 +35911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35887,7 +35921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(269)),
+                            FieldValue::Reference(DeclarationId(271)),
                         )]),
                     ),
                     (
@@ -35897,7 +35931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -35910,7 +35944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35920,7 +35954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(293)),
+                            FieldValue::Reference(DeclarationId(295)),
                         )]),
                     ),
                     (
@@ -35930,7 +35964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -35943,7 +35977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35953,7 +35987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(271)),
+                            FieldValue::Reference(DeclarationId(273)),
                         )]),
                     ),
                     (
@@ -35965,7 +35999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -35978,7 +36012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -35988,7 +36022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(262)),
+                            FieldValue::Reference(DeclarationId(264)),
                         )]),
                     ),
                     (
@@ -36000,7 +36034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -36013,7 +36047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -36023,7 +36057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(260)),
+                            FieldValue::Reference(DeclarationId(262)),
                         )]),
                     ),
                     (
@@ -36035,7 +36069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -36048,7 +36082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -36058,7 +36092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(250)),
+                            FieldValue::Reference(DeclarationId(252)),
                         )]),
                     ),
                     (
@@ -36070,7 +36104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -36083,21 +36117,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(1135)),
-                FieldValue::Reference(DeclarationId(1136)),
                 FieldValue::Reference(DeclarationId(1137)),
                 FieldValue::Reference(DeclarationId(1138)),
+                FieldValue::Reference(DeclarationId(1139)),
+                FieldValue::Reference(DeclarationId(1140)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(291)),
+                            FieldValue::Reference(DeclarationId(293)),
                         )]),
                     ),
                     (
@@ -36107,7 +36141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -36120,7 +36154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -36130,7 +36164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(297)),
+                            FieldValue::Reference(DeclarationId(299)),
                         )]),
                     ),
                     (
@@ -36140,7 +36174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -36153,7 +36187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -36163,7 +36197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(292)),
+                            FieldValue::Reference(DeclarationId(294)),
                         )]),
                     ),
                     (
@@ -36175,7 +36209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -36188,7 +36222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -36198,7 +36232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(248)),
+                            FieldValue::Reference(DeclarationId(250)),
                         )]),
                     ),
                     (
@@ -36208,7 +36242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -36221,7 +36255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -36231,7 +36265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(295)),
+                            FieldValue::Reference(DeclarationId(297)),
                         )]),
                     ),
                     (
@@ -36241,7 +36275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -36254,7 +36288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -36269,25 +36303,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1140),
+            id: DeclarationId(1142),
             name: Some("ResourceHandle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "resource_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "key".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cap".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                 ],
             },
@@ -36302,12 +36336,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1141),
+            id: DeclarationId(1143),
             name: Some("ResourceReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1243),
+                    ty: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -36321,17 +36355,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1142),
+            id: DeclarationId(1144),
             name: Some("NamedField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1143),
+                        ty: DeclarationId(1145),
                     },
                 ],
             },
@@ -36346,29 +36380,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1143),
+            id: DeclarationId(1145),
             name: Some("Value".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2356),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2358),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2359),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2360),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2359),
+                        ty: DeclarationId(2361),
                     },
                 ],
             },
@@ -36383,15 +36417,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2122, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1144),
+            id: DeclarationId(1146),
             name: Some("ProgramObservation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observed".to_string(),
-                    ty: DeclarationId(1145),
+                    ty: DeclarationId(1147),
                 }],
             },
-            type_params: vec![DeclarationId(1145)],
+            type_params: vec![DeclarationId(1147)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36402,7 +36436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
+            id: DeclarationId(1147),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -36416,12 +36450,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
+            id: DeclarationId(1148),
             name: Some("EvalFrame".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2360),
+                    ty: DeclarationId(2362),
                 }],
             },
             type_params: vec![],
@@ -36435,12 +36469,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
+            id: DeclarationId(1149),
             name: Some("EvalStateStack".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2361),
+                    ty: DeclarationId(2363),
                 }],
             },
             type_params: vec![],
@@ -36454,12 +36488,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
+            id: DeclarationId(1150),
             name: Some("EvalStateKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "state".to_string(),
-                    ty: DeclarationId(1147),
+                    ty: DeclarationId(1149),
                 }],
             },
             type_params: vec![],
@@ -36473,12 +36507,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
+            id: DeclarationId(1151),
             name: Some("EvalStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2362),
+                    ty: DeclarationId(2364),
                 }],
             },
             type_params: vec![],
@@ -36492,17 +36526,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
+            id: DeclarationId(1152),
             name: Some("InputEvaluationOrder".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2363),
+                        ty: DeclarationId(2365),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2364),
+                        ty: DeclarationId(2366),
                     },
                 ],
             },
@@ -36517,25 +36551,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
+            id: DeclarationId(1153),
             name: Some("EvalMemoKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "program".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "state_key".to_string(),
-                        ty: DeclarationId(1148),
+                        ty: DeclarationId(1150),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1149),
+                        ty: DeclarationId(1151),
                     },
                 ],
             },
@@ -36550,11 +36584,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
+            id: DeclarationId(1154),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701), DeclarationId(2353)],
-                output: DeclarationId(1143),
+                inputs: vec![DeclarationId(809), DeclarationId(703), DeclarationId(2355)],
+                output: DeclarationId(1145),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
             type_params: vec![],
@@ -36567,13 +36601,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1153), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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(261)))])), ("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(2217), 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(2215), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) });
-        declarations.push(Declaration { id: DeclarationId(1154), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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(247)))])), ("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(2217), 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(2215), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) });
-        declarations.push(Declaration { id: DeclarationId(1155), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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(246)))])), ("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(2217), 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(2215), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) });
-        declarations.push(Declaration { id: DeclarationId(1156), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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 mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2217), 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(2215), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) });
-        declarations.push(Declaration { id: DeclarationId(1157), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(665), arguments: vec![TemplateArgument { parameter: DeclarationId(666), value: DeclarationId(1022) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2365)), 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(256)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(269)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), payload: vec![] })]), 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}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), 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}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), 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}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), payload: vec![] })]), FieldValue::Reference(DeclarationId(1153)), FieldValue::Reference(DeclarationId(1154)), FieldValue::Reference(DeclarationId(1155)), FieldValue::Reference(DeclarationId(1156)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(291)))])), ("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(2216), 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(2215), 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("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2216), 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(2215), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) });
+        declarations.push(Declaration { id: DeclarationId(1155), name: Some("rust_filter_method_template_contract".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::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(2219), 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(2217), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) });
+        declarations.push(Declaration { id: DeclarationId(1156), name: Some("rust_any_method_template_contract".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::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(2219), 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(2217), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) });
+        declarations.push(Declaration { id: DeclarationId(1157), name: Some("rust_all_method_template_contract".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::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(2219), 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(2217), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) });
+        declarations.push(Declaration { id: DeclarationId(1158), name: Some("rust_flat_map_method_template_contract".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::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(2219), 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(2217), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) });
+        declarations.push(Declaration { id: DeclarationId(1159), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(667), arguments: vec![TemplateArgument { parameter: DeclarationId(668), value: DeclarationId(1024) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2367)), 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(2218), 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(2217), 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(2218), 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(2217), 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(2218), 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(2217), 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(2218), 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(2217), 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(2218), 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(2217), 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(2218), 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(2217), 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(2218), 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(2217), payload: vec![] })]), FieldValue::Reference(DeclarationId(1155)), FieldValue::Reference(DeclarationId(1156)), FieldValue::Reference(DeclarationId(1157)), FieldValue::Reference(DeclarationId(1158)), 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(2218), 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(2217), 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(2218), 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(2217), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) });
         declarations.push(Declaration {
-            id: DeclarationId(1158),
+            id: DeclarationId(1160),
             name: Some("InputField".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -36587,17 +36621,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
+            id: DeclarationId(1161),
             name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "method".to_string(),
-                        ty: DeclarationId(196),
+                        ty: DeclarationId(198),
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(710),
+                        ty: DeclarationId(712),
                     },
                 ],
             },
@@ -36612,12 +36646,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 4616, 4688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1160),
+            id: DeclarationId(1162),
             name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1243),
+                    ty: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -36631,21 +36665,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 5496, 5539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
+            id: DeclarationId(1163),
             name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "callable".to_string(),
-                        ty: DeclarationId(1160),
+                        ty: DeclarationId(1162),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2366),
+                        ty: DeclarationId(2368),
                     },
                     Field {
                         label: "endpoint".to_string(),
-                        ty: DeclarationId(1159),
+                        ty: DeclarationId(1161),
                     },
                 ],
             },
@@ -36660,21 +36694,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6748, 6858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
+            id: DeclarationId(1164),
             name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2379),
                     },
                 ],
             },
@@ -36689,10 +36723,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 742, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
+            id: DeclarationId(1165),
             name: Some("evidence_rank".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1162)],
+                inputs: vec![DeclarationId(1164)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)),
             },
@@ -36707,11 +36741,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 812, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
+            id: DeclarationId(1166),
             name: Some("merge_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1162), DeclarationId(1162)],
-                output: DeclarationId(1162),
+                inputs: vec![DeclarationId(1164), DeclarationId(1164)],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1082,
@@ -36729,11 +36763,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 1005, 1410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
+            id: DeclarationId(1167),
             name: Some("join_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1162), DeclarationId(1162)],
-                output: DeclarationId(1162),
+                inputs: vec![DeclarationId(1164), DeclarationId(1164)],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1556,
@@ -36751,11 +36785,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 1480, 1755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
+            id: DeclarationId(1168),
             name: Some("promote_to_strict".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1162)],
-                output: DeclarationId(1162),
+                inputs: vec![DeclarationId(1164)],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2217,
@@ -36773,11 +36807,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2150, 2336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
+            id: DeclarationId(1169),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2367), DeclarationId(2368)],
-                output: DeclarationId(2369),
+                inputs: vec![DeclarationId(2369), DeclarationId(2370)],
+                output: DeclarationId(2371),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -36795,11 +36829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2400, 2664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
+            id: DeclarationId(1170),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2370), DeclarationId(228), DeclarationId(1162)],
-                output: DeclarationId(2371),
+                inputs: vec![DeclarationId(2372), DeclarationId(230), DeclarationId(1164)],
+                output: DeclarationId(2373),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -36817,29 +36851,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2701, 3007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
+            id: DeclarationId(1171),
             name: Some("RankingDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2380),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2383),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2384),
                     },
                 ],
             },
@@ -36854,17 +36888,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3306, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1170),
+            id: DeclarationId(1172),
             name: Some("PositiveDescentAmount".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2385),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2386),
                     },
                 ],
             },
@@ -36879,10 +36913,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4478, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1171),
+            id: DeclarationId(1173),
             name: Some("positive_descent_count".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1170)],
+                inputs: vec![DeclarationId(1172)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -36901,17 +36935,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4818, 4989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1172),
+            id: DeclarationId(1174),
             name: Some("ProportionalDivisor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2387),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2388),
                     },
                 ],
             },
@@ -36926,10 +36960,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5455, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1173),
+            id: DeclarationId(1175),
             name: Some("proportional_divisor_to_int".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1172)],
+                inputs: vec![DeclarationId(1174)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -36948,7 +36982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5547, 5722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1174),
+            id: DeclarationId(1176),
             name: Some("peano_literal_materialization_cap".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -36970,11 +37004,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5906, 5959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1175),
+            id: DeclarationId(1177),
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2372),
+                output: DeclarationId(2374),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -36992,11 +37026,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6341, 6780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
+            id: DeclarationId(1178),
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2373),
+                output: DeclarationId(2375),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -37014,37 +37048,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6782, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
+            id: DeclarationId(1179),
             name: Some("DescentSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2389),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2388),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2389),
+                        ty: DeclarationId(2391),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2392),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2391),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2394),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2393),
+                        ty: DeclarationId(2395),
                     },
                 ],
             },
@@ -37059,12 +37093,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7626, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
+            id: DeclarationId(1180),
             name: Some("TerminationProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2394),
+                    ty: DeclarationId(2396),
                 }],
             },
             type_params: vec![],
@@ -37078,21 +37112,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7949, 8011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
+            id: DeclarationId(1181),
             name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "callee".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2397),
                     },
                 ],
             },
@@ -37107,12 +37141,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8156, 8242),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
+            id: DeclarationId(1182),
             name: Some("StrictEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2396),
+                    ty: DeclarationId(2398),
                 }],
             },
             type_params: vec![],
@@ -37126,17 +37160,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8716, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
+            id: DeclarationId(1183),
             name: Some("NonStrictEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2399),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2398),
+                        ty: DeclarationId(2400),
                     },
                 ],
             },
@@ -37151,17 +37185,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9112, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
+            id: DeclarationId(1184),
             name: Some("DescentResidual".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2399),
+                        ty: DeclarationId(2401),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2402),
                     },
                 ],
             },
@@ -37176,21 +37210,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10238, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
+            id: DeclarationId(1185),
             name: Some("DescentExecutionProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cluster".to_string(),
-                        ty: DeclarationId(704),
+                        ty: DeclarationId(706),
                     },
                     Field {
                         label: "port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2403),
                     },
                 ],
             },
@@ -37205,11 +37239,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 11157, 11263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
+            id: DeclarationId(1186),
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(704), DeclarationId(702)],
-                output: DeclarationId(2374),
+                inputs: vec![DeclarationId(809), DeclarationId(706), DeclarationId(704)],
+                output: DeclarationId(2376),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -37227,11 +37261,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 12279, 12439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
+            id: DeclarationId(1187),
             name: Some("timing_lens_module_path_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(156),
+                output: DeclarationId(158),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(419))),
             },
             type_params: vec![],
@@ -37245,7 +37279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 1391, 1472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1186),
+            id: DeclarationId(1188),
             name: Some("Nanoseconds".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -37264,25 +37298,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 1933, 1966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1187),
+            id: DeclarationId(1189),
             name: Some("TimingMeasurement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2406),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2407),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2408),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2409),
                     },
                 ],
             },
@@ -37297,37 +37331,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 3977, 4077),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1188),
+            id: DeclarationId(1190),
             name: Some("WorkflowObservationAnchor".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_node".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "artifact_digest".to_string(),
-                        ty: DeclarationId(171),
+                        ty: DeclarationId(173),
                     },
                     Field {
                         label: "producer_id".to_string(),
-                        ty: DeclarationId(172),
+                        ty: DeclarationId(174),
                     },
                     Field {
                         label: "observer_id".to_string(),
-                        ty: DeclarationId(173),
+                        ty: DeclarationId(175),
                     },
                     Field {
                         label: "prover_id".to_string(),
-                        ty: DeclarationId(174),
+                        ty: DeclarationId(176),
                     },
                     Field {
                         label: "attached_at_ns".to_string(),
-                        ty: DeclarationId(1186),
+                        ty: DeclarationId(1188),
                     },
                     Field {
                         label: "workflow_run_id".to_string(),
-                        ty: DeclarationId(175),
+                        ty: DeclarationId(177),
                     },
                 ],
             },
@@ -37342,12 +37376,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5538, 5787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1189),
+            id: DeclarationId(1191),
             name: Some("TimingObservationSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2408),
+                    ty: DeclarationId(2410),
                 }],
             },
             type_params: vec![],
@@ -37361,17 +37395,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5871, 5945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1190),
+            id: DeclarationId(1192),
             name: Some("TimingObservationEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "anchor".to_string(),
-                        ty: DeclarationId(1188),
+                        ty: DeclarationId(1190),
                     },
                     Field {
                         label: "measurement".to_string(),
-                        ty: DeclarationId(1187),
+                        ty: DeclarationId(1189),
                     },
                 ],
             },
@@ -37386,12 +37420,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5947, 6047),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1191),
+            id: DeclarationId(1193),
             name: Some("TimingBudget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "max".to_string(),
-                    ty: DeclarationId(1186),
+                    ty: DeclarationId(1188),
                 }],
             },
             type_params: vec![],
@@ -37405,11 +37439,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6185, 6225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
+            id: DeclarationId(1194),
             name: Some("timing_measurement_unobserved".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1187),
+                output: DeclarationId(1189),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(421))),
             },
             type_params: vec![],
@@ -37423,11 +37457,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6227, 6297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
+            id: DeclarationId(1195),
             name: Some("timing_measurement_lens_combine".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1187), DeclarationId(1187), DeclarationId(126)],
-                output: DeclarationId(1187),
+                inputs: vec![DeclarationId(1189), DeclarationId(1189), DeclarationId(128)],
+                output: DeclarationId(1189),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(453))),
             },
             type_params: vec![],
@@ -37441,11 +37475,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6455, 7347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
+            id: DeclarationId(1196),
             name: Some("timing_sequential_op".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1187), DeclarationId(1187)],
-                output: DeclarationId(1187),
+                inputs: vec![DeclarationId(1189), DeclarationId(1189)],
+                output: DeclarationId(1189),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(456))),
             },
             type_params: vec![],
@@ -37459,11 +37493,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7422, 7558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
+            id: DeclarationId(1197),
             name: Some("nanoseconds_zero".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1186),
+                output: DeclarationId(1188),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(459))),
             },
             type_params: vec![],
@@ -37477,11 +37511,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7560, 7613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
+            id: DeclarationId(1198),
             name: Some("timing_sequential_identity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1187),
+                output: DeclarationId(1189),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(462))),
             },
             type_params: vec![],
@@ -37495,11 +37529,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7615, 7713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
+            id: DeclarationId(1199),
             name: Some("timing_branch_op".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1187), DeclarationId(1187)],
-                output: DeclarationId(1187),
+                inputs: vec![DeclarationId(1189), DeclarationId(1189)],
+                output: DeclarationId(1189),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(465))),
             },
             type_params: vec![],
@@ -37513,11 +37547,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7773, 7906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
+            id: DeclarationId(1200),
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2402),
+                output: DeclarationId(2404),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(467))),
             },
             type_params: vec![],
@@ -37531,11 +37565,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7908, 7972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
+            id: DeclarationId(1201),
             name: Some("timing_lens_behavior_span".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(806)],
-                output: DeclarationId(157),
+                inputs: vec![DeclarationId(808)],
+                output: DeclarationId(159),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(474))),
             },
             type_params: vec![],
@@ -37549,11 +37583,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8155, 8354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
+            id: DeclarationId(1202),
             name: Some("timing_lens_scaffold_non_evidence_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(157)],
-                output: DeclarationId(950),
+                inputs: vec![DeclarationId(230), DeclarationId(159)],
+                output: DeclarationId(952),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(479))),
             },
             type_params: vec![],
@@ -37567,11 +37601,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8601, 8813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
+            id: DeclarationId(1203),
             name: Some("timing_lens_degenerate_empty_dag_span".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(157),
+                output: DeclarationId(159),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(484))),
             },
             type_params: vec![],
@@ -37585,11 +37619,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
+            id: DeclarationId(1204),
             name: Some("timing_lens_validate_non_observed".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(228)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(809), DeclarationId(230)],
+                output: DeclarationId(956),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(500))),
             },
             type_params: vec![],
@@ -37603,11 +37637,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9643, 10348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
+            id: DeclarationId(1205),
             name: Some("timing_measurement_iterate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1187), DeclarationId(797)],
-                output: DeclarationId(1187),
+                inputs: vec![DeclarationId(1189), DeclarationId(799)],
+                output: DeclarationId(1189),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(509))),
             },
             type_params: vec![],
@@ -37621,11 +37655,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10673, 11034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
+            id: DeclarationId(1206),
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(806)],
-                output: DeclarationId(2403),
+                inputs: vec![DeclarationId(809), DeclarationId(808)],
+                output: DeclarationId(2405),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(546))),
             },
             type_params: vec![],
@@ -37639,11 +37673,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 12637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
+            id: DeclarationId(1207),
             name: Some("timing_lens_validate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(1187)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(809), DeclarationId(1189)],
+                output: DeclarationId(956),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(560))),
             },
             type_params: vec![],
@@ -37657,189 +37691,189 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12639, 13484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
+            id: DeclarationId(1208),
             name: Some("TokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2420),
+                        ty: DeclarationId(2422),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2421),
+                        ty: DeclarationId(2423),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2424),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2423),
+                        ty: DeclarationId(2425),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2426),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2425),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2428),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2427),
+                        ty: DeclarationId(2429),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2430),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2431),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2434),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2436),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2437),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2438),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2439),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2441),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2445),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2447),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2451),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2455),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2456),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2458),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2457),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2460),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2459),
+                        ty: DeclarationId(2461),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2461),
+                        ty: DeclarationId(2463),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2465),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2466),
                     },
                 ],
             },
@@ -37854,17 +37888,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
+            id: DeclarationId(1209),
             name: Some("Token".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1206),
+                        ty: DeclarationId(1208),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -37879,61 +37913,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1355, 1406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
+            id: DeclarationId(1210),
             name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2467),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2470),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2471),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2470),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2473),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2474),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2475),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2476),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2475),
+                        ty: DeclarationId(2477),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2476),
+                        ty: DeclarationId(2478),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2479),
                     },
                 ],
             },
@@ -37948,121 +37982,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1765, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
+            id: DeclarationId(1211),
             name: Some("PunctTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2478),
+                        ty: DeclarationId(2480),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2479),
+                        ty: DeclarationId(2481),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2482),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2481),
+                        ty: DeclarationId(2483),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2482),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2485),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2484),
+                        ty: DeclarationId(2486),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2485),
+                        ty: DeclarationId(2487),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2488),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2487),
+                        ty: DeclarationId(2489),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2488),
+                        ty: DeclarationId(2490),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2491),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2490),
+                        ty: DeclarationId(2492),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2491),
+                        ty: DeclarationId(2493),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2492),
+                        ty: DeclarationId(2494),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2493),
+                        ty: DeclarationId(2495),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2494),
+                        ty: DeclarationId(2496),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2497),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2496),
+                        ty: DeclarationId(2498),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2497),
+                        ty: DeclarationId(2499),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2498),
+                        ty: DeclarationId(2500),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2499),
+                        ty: DeclarationId(2501),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2500),
+                        ty: DeclarationId(2502),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2501),
+                        ty: DeclarationId(2503),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2502),
+                        ty: DeclarationId(2504),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2503),
+                        ty: DeclarationId(2505),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2504),
+                        ty: DeclarationId(2506),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2505),
+                        ty: DeclarationId(2507),
                     },
                 ],
             },
@@ -38077,17 +38111,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
+            id: DeclarationId(1212),
             name: Some("LocalPunctSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1209),
+                        ty: DeclarationId(1211),
                     },
                 ],
             },
@@ -38102,13 +38136,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
+            id: DeclarationId(1213),
             name: Some("StringEscapeSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "suffix".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "output_codepoint".to_string(),
@@ -38127,10 +38161,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
+            id: DeclarationId(1214),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -38144,10 +38178,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1213),
+            id: DeclarationId(1215),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(149),
+                template: DeclarationId(151),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -38161,7 +38195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
+            id: DeclarationId(1216),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38175,15 +38209,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
+            id: DeclarationId(1217),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1214),
+                template: DeclarationId(1216),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1214)),
+            meta_tag: Some(DeclarationId(1216)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -38192,15 +38226,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
+            id: DeclarationId(1218),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1214),
+                template: DeclarationId(1216),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1214)),
+            meta_tag: Some(DeclarationId(1216)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -38209,7 +38243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
+            id: DeclarationId(1219),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38223,15 +38257,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
+            id: DeclarationId(1220),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1217),
+                template: DeclarationId(1219),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1217)),
+            meta_tag: Some(DeclarationId(1219)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -38240,7 +38274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
+            id: DeclarationId(1221),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38254,15 +38288,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
+            id: DeclarationId(1222),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1219),
+                template: DeclarationId(1221),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1219)),
+            meta_tag: Some(DeclarationId(1221)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -38271,49 +38305,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
+            id: DeclarationId(1223),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2509),
+                        ty: DeclarationId(2511),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2510),
+                        ty: DeclarationId(2512),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2511),
+                        ty: DeclarationId(2513),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2512),
+                        ty: DeclarationId(2514),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2513),
+                        ty: DeclarationId(2515),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2514),
+                        ty: DeclarationId(2516),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2515),
+                        ty: DeclarationId(2517),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2516),
+                        ty: DeclarationId(2518),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2517),
+                        ty: DeclarationId(2519),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2518),
+                        ty: DeclarationId(2520),
                     },
                 ],
             },
@@ -38328,17 +38362,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1222),
+            id: DeclarationId(1224),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2519),
+                        ty: DeclarationId(2521),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2520),
+                        ty: DeclarationId(2522),
                     },
                 ],
             },
@@ -38353,17 +38387,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1223),
+            id: DeclarationId(1225),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1221),
+                        ty: DeclarationId(1223),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1222),
+                        ty: DeclarationId(1224),
                     },
                 ],
             },
@@ -38378,17 +38412,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1224),
+            id: DeclarationId(1226),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2521),
+                        ty: DeclarationId(2523),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2522),
+                        ty: DeclarationId(2524),
                     },
                 ],
             },
@@ -38403,12 +38437,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1225),
+            id: DeclarationId(1227),
             name: Some("PerfBudgetComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2523),
+                    ty: DeclarationId(2525),
                 }],
             },
             type_params: vec![],
@@ -38422,21 +38456,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3998, 4042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1226),
+            id: DeclarationId(1228),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2524),
+                        ty: DeclarationId(2526),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2525),
+                        ty: DeclarationId(2527),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2526),
+                        ty: DeclarationId(2528),
                     },
                 ],
             },
@@ -38451,105 +38485,105 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4831, 4901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1227),
+            id: DeclarationId(1229),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2527),
+                        ty: DeclarationId(2529),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2528),
+                        ty: DeclarationId(2530),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2529),
+                        ty: DeclarationId(2531),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2530),
+                        ty: DeclarationId(2532),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2531),
+                        ty: DeclarationId(2533),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2532),
+                        ty: DeclarationId(2534),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2533),
+                        ty: DeclarationId(2535),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2534),
+                        ty: DeclarationId(2536),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2536),
+                        ty: DeclarationId(2538),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2538),
+                        ty: DeclarationId(2540),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2539),
+                        ty: DeclarationId(2541),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2540),
+                        ty: DeclarationId(2542),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2541),
+                        ty: DeclarationId(2543),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2542),
+                        ty: DeclarationId(2544),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2543),
+                        ty: DeclarationId(2545),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2544),
+                        ty: DeclarationId(2546),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2545),
+                        ty: DeclarationId(2547),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2546),
+                        ty: DeclarationId(2548),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2547),
+                        ty: DeclarationId(2549),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2548),
+                        ty: DeclarationId(2550),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2550),
+                        ty: DeclarationId(2552),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2551),
+                        ty: DeclarationId(2553),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2552),
+                        ty: DeclarationId(2554),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2553),
+                        ty: DeclarationId(2555),
                     },
                 ],
             },
@@ -38564,7 +38598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4903, 15825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1228),
+            id: DeclarationId(1230),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38578,12 +38612,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15933, 15953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1229),
+            id: DeclarationId(1231),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1243),
+                    ty: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -38597,29 +38631,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16096, 16151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1230),
+            id: DeclarationId(1232),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "source".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "file_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1227),
+                        ty: DeclarationId(1229),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2554),
+                        ty: DeclarationId(2556),
                     },
                 ],
             },
@@ -38634,17 +38668,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16761, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1231),
+            id: DeclarationId(1233),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2555),
+                        ty: DeclarationId(2557),
                     },
                 ],
             },
@@ -38659,17 +38693,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16896, 16955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1232),
+            id: DeclarationId(1234),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "claim_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2556),
+                        ty: DeclarationId(2558),
                     },
                 ],
             },
@@ -38684,11 +38718,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17153, 17234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1233),
+            id: DeclarationId(1235),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1230)],
-                output: DeclarationId(2506),
+                inputs: vec![DeclarationId(1232)],
+                output: DeclarationId(2508),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17676,
@@ -38706,11 +38740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17605, 17692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1234),
+            id: DeclarationId(1236),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1230)],
-                output: DeclarationId(1232),
+                inputs: vec![DeclarationId(1232)],
+                output: DeclarationId(1234),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17750,
@@ -38728,11 +38762,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17694, 17835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1235),
+            id: DeclarationId(1237),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2507)],
-                output: DeclarationId(2508),
+                inputs: vec![DeclarationId(2509)],
+                output: DeclarationId(2510),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17918,
@@ -38750,11 +38784,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17837, 17957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1236),
+            id: DeclarationId(1238),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(2557),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(2559),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(562))),
             },
             type_params: vec![],
@@ -38768,7 +38802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1237),
+            id: DeclarationId(1239),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38782,7 +38816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1238),
+            id: DeclarationId(1240),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38796,7 +38830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1239),
+            id: DeclarationId(1241),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38810,7 +38844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1240),
+            id: DeclarationId(1242),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38824,7 +38858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1241),
+            id: DeclarationId(1243),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38838,7 +38872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1242),
+            id: DeclarationId(1244),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38852,7 +38886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1243),
+            id: DeclarationId(1245),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38866,15 +38900,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1244),
+            id: DeclarationId(1246),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38882,14 +38916,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2099),
+                            constructor: DeclarationId(2101),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2102),
+                            constructor: DeclarationId(2104),
                             payload: vec![],
                         },
                     ),
@@ -38900,22 +38934,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2055, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1245),
+            id: DeclarationId(1247),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(931)),
+                        FieldValue::Reference(DeclarationId(933)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -38930,15 +38964,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2159, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1246),
+            id: DeclarationId(1248),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38951,22 +38985,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2311, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1247),
+            id: DeclarationId(1249),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
@@ -38992,22 +39026,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2388, 2518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1248),
+            id: DeclarationId(1250),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
@@ -39033,22 +39067,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2520, 2654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1249),
+            id: DeclarationId(1251),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -39061,17 +39095,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1778),
+                                constructor: DeclarationId(1780),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1777),
+                                        constructor: DeclarationId(1779),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1775),
+                                            constructor: DeclarationId(1777),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -39083,7 +39117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1248)),
+                        FieldValue::Reference(DeclarationId(1250)),
                     ),
                 ],
             }),
@@ -39092,22 +39126,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2656, 2959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1250),
+            id: DeclarationId(1252),
             name: Some("go_integer_inhabit_int_platform_dependent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -39120,13 +39154,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1247)),
+                        FieldValue::Reference(DeclarationId(1249)),
                     ),
                 ],
             }),
@@ -39135,26 +39169,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3397, 3598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1251),
+            id: DeclarationId(1253),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39176,26 +39210,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3600, 3731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1252),
+            id: DeclarationId(1254),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39217,26 +39251,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3733, 3870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1253),
+            id: DeclarationId(1255),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39258,26 +39292,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3872, 4010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1254),
+            id: DeclarationId(1256),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39299,26 +39333,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4012, 4150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1255),
+            id: DeclarationId(1257),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39340,26 +39374,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4152, 4311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1256),
+            id: DeclarationId(1258),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(704)),
+                        FieldValue::Reference(DeclarationId(706)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39381,26 +39415,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4313, 4460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1257),
+            id: DeclarationId(1259),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(758)),
+                        FieldValue::Reference(DeclarationId(760)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39420,7 +39454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -39443,26 +39477,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4462, 4703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
+            id: DeclarationId(1260),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(759)),
+                        FieldValue::Reference(DeclarationId(761)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39484,26 +39518,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4705, 4853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1259),
+            id: DeclarationId(1261),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(760)),
+                        FieldValue::Reference(DeclarationId(762)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39524,7 +39558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -39543,7 +39577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -39564,7 +39598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -39588,26 +39622,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4855, 5238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
+            id: DeclarationId(1262),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(157)),
+                        FieldValue::Reference(DeclarationId(159)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39628,7 +39662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -39647,7 +39681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -39666,7 +39700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -39690,26 +39724,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5240, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
+            id: DeclarationId(1263),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(761)),
+                        FieldValue::Reference(DeclarationId(763)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39731,26 +39765,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5636, 5790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
+            id: DeclarationId(1264),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(762)),
+                        FieldValue::Reference(DeclarationId(764)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39772,26 +39806,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5792, 5946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
+            id: DeclarationId(1265),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(769)),
+                        FieldValue::Reference(DeclarationId(771)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39813,26 +39847,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5948, 6117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
+            id: DeclarationId(1266),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(765)),
+                        FieldValue::Reference(DeclarationId(767)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39854,26 +39888,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6119, 6263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
+            id: DeclarationId(1267),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(763)),
+                        FieldValue::Reference(DeclarationId(765)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39897,26 +39931,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6265, 6450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1268),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(764)),
+                        FieldValue::Reference(DeclarationId(766)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39938,26 +39972,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6452, 6612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1269),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(770)),
+                        FieldValue::Reference(DeclarationId(772)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39978,7 +40012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -39997,7 +40031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -40021,26 +40055,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6614, 6916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1270),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(771)),
+                        FieldValue::Reference(DeclarationId(773)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40063,7 +40097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -40082,7 +40116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -40106,26 +40140,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6918, 7255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1271),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(779)),
+                        FieldValue::Reference(DeclarationId(781)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40148,7 +40182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -40167,7 +40201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -40191,26 +40225,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7257, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1272),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(780)),
+                        FieldValue::Reference(DeclarationId(782)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40232,7 +40266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -40255,26 +40289,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7600, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1273),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(772)),
+                        FieldValue::Reference(DeclarationId(774)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40295,7 +40329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -40314,7 +40348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -40338,26 +40372,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7874, 8185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1274),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(705)),
+                        FieldValue::Reference(DeclarationId(707)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40378,7 +40412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -40397,7 +40431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -40421,26 +40455,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8187, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1275),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(707)),
+                        FieldValue::Reference(DeclarationId(709)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40461,7 +40495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -40480,7 +40514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -40499,7 +40533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -40523,26 +40557,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8505, 8914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1276),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(790)),
+                        FieldValue::Reference(DeclarationId(792)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40563,7 +40597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -40582,7 +40616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -40606,26 +40640,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8916, 9232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1277),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(791)),
+                        FieldValue::Reference(DeclarationId(793)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40645,7 +40679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2186),
+                                    constructor: DeclarationId(2188),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -40668,26 +40702,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9234, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1278),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(794)),
+                        FieldValue::Reference(DeclarationId(796)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40707,7 +40741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -40730,26 +40764,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9477, 9718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1279),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(795)),
+                        FieldValue::Reference(DeclarationId(797)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40769,7 +40803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -40792,26 +40826,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9720, 9979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1280),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(796)),
+                        FieldValue::Reference(DeclarationId(798)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40832,7 +40866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -40853,7 +40887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -40877,26 +40911,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9981, 10314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1281),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(773)),
+                        FieldValue::Reference(DeclarationId(775)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40918,26 +40952,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10316, 10467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1282),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(774)),
+                        FieldValue::Reference(DeclarationId(776)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40959,26 +40993,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10469, 10617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1283),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(776)),
+                        FieldValue::Reference(DeclarationId(778)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41000,26 +41034,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10619, 10767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1284),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(777)),
+                        FieldValue::Reference(DeclarationId(779)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41041,26 +41075,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10769, 10932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1285),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(778)),
+                        FieldValue::Reference(DeclarationId(780)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41081,7 +41115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41100,7 +41134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -41121,7 +41155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -41142,7 +41176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -41163,7 +41197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -41184,7 +41218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -41205,7 +41239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -41226,7 +41260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -41247,7 +41281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -41266,7 +41300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41290,26 +41324,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10934, 11951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1286),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(781)),
+                        FieldValue::Reference(DeclarationId(783)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41331,26 +41365,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11953, 12110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1287),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(782)),
+                        FieldValue::Reference(DeclarationId(784)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41372,26 +41406,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12112, 12269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1288),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(784)),
+                        FieldValue::Reference(DeclarationId(786)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41413,26 +41447,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12271, 12419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1289),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(785)),
+                        FieldValue::Reference(DeclarationId(787)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41454,26 +41488,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12421, 12578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1290),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(786)),
+                        FieldValue::Reference(DeclarationId(788)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41495,26 +41529,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12580, 12746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1291),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(787)),
+                        FieldValue::Reference(DeclarationId(789)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41536,26 +41570,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12748, 12908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1292),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(788)),
+                        FieldValue::Reference(DeclarationId(790)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41578,7 +41612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -41599,7 +41633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -41623,26 +41657,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12910, 13261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1293),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(789)),
+                        FieldValue::Reference(DeclarationId(791)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41663,7 +41697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -41684,7 +41718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41703,7 +41737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -41722,7 +41756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -41746,26 +41780,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13263, 13750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1294),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(797)),
+                        FieldValue::Reference(DeclarationId(799)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41787,26 +41821,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13752, 13900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1293),
+            id: DeclarationId(1295),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(799)),
+                        FieldValue::Reference(DeclarationId(801)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41827,7 +41861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41846,7 +41880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -41867,7 +41901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41886,7 +41920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41910,26 +41944,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14374, 14848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1296),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(800)),
+                        FieldValue::Reference(DeclarationId(802)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41950,7 +41984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41969,7 +42003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -41988,7 +42022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -42009,7 +42043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42028,7 +42062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42052,26 +42086,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14850, 15415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1295),
+            id: DeclarationId(1297),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(802)),
+                        FieldValue::Reference(DeclarationId(804)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42092,7 +42126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42111,7 +42145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -42130,7 +42164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -42151,7 +42185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42170,7 +42204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42191,7 +42225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -42215,26 +42249,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 15417, 16074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1296),
+            id: DeclarationId(1298),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(803)),
+                        FieldValue::Reference(DeclarationId(805)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42255,7 +42289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42274,7 +42308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -42293,7 +42327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -42312,7 +42346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -42331,7 +42365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -42352,7 +42386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42371,7 +42405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42395,26 +42429,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16076, 16778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1297),
+            id: DeclarationId(1299),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(805)),
+                        FieldValue::Reference(DeclarationId(807)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42435,7 +42469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42454,7 +42488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -42475,7 +42509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42494,7 +42528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -42513,7 +42547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42534,7 +42568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -42558,26 +42592,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16780, 17431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1298),
+            id: DeclarationId(1300),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(806)),
+                        FieldValue::Reference(DeclarationId(808)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42599,26 +42633,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17433, 17577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1299),
+            id: DeclarationId(1301),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(807)),
+                        FieldValue::Reference(DeclarationId(809)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42641,7 +42675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -42660,7 +42694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -42679,7 +42713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -42700,7 +42734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -42724,26 +42758,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17579, 18046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1300),
+            id: DeclarationId(1302),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1116)),
+                        FieldValue::Reference(DeclarationId(1118)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42763,7 +42797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -42786,26 +42820,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18349, 18590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1301),
+            id: DeclarationId(1303),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1129)),
+                        FieldValue::Reference(DeclarationId(1131)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42827,26 +42861,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18592, 18746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1304),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1117)),
+                        FieldValue::Reference(DeclarationId(1119)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42867,7 +42901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -42886,7 +42920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -42907,7 +42941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -42931,26 +42965,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18748, 19146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1303),
+            id: DeclarationId(1305),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1118)),
+                        FieldValue::Reference(DeclarationId(1120)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42971,7 +43005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -42990,7 +43024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -43014,26 +43048,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19148, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1304),
+            id: DeclarationId(1306),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1119)),
+                        FieldValue::Reference(DeclarationId(1121)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43054,7 +43088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43073,7 +43107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -43092,7 +43126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43116,26 +43150,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19459, 19861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1305),
+            id: DeclarationId(1307),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1120)),
+                        FieldValue::Reference(DeclarationId(1122)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43157,26 +43191,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19863, 20026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1306),
+            id: DeclarationId(1308),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1121)),
+                        FieldValue::Reference(DeclarationId(1123)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43198,26 +43232,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20028, 20182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1307),
+            id: DeclarationId(1309),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1122)),
+                        FieldValue::Reference(DeclarationId(1124)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43238,7 +43272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43257,7 +43291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -43276,7 +43310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43300,26 +43334,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20184, 20595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1308),
+            id: DeclarationId(1310),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1123)),
+                        FieldValue::Reference(DeclarationId(1125)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43340,7 +43374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -43361,7 +43395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -43380,7 +43414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -43399,7 +43433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43423,26 +43457,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20597, 21082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1309),
+            id: DeclarationId(1311),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1124)),
+                        FieldValue::Reference(DeclarationId(1126)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43463,7 +43497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -43482,7 +43516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -43501,7 +43535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43525,26 +43559,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21084, 21490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1312),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1125)),
+                        FieldValue::Reference(DeclarationId(1127)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43565,7 +43599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43584,7 +43618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -43603,7 +43637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43627,26 +43661,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21492, 21910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1313),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1126)),
+                        FieldValue::Reference(DeclarationId(1128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43668,26 +43702,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21912, 22075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1314),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1127)),
+                        FieldValue::Reference(DeclarationId(1129)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43709,26 +43743,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22077, 22240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1315),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1128)),
+                        FieldValue::Reference(DeclarationId(1130)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43750,28 +43784,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22242, 22396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1316),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(344))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(346))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} + {rhs})".to_string())),
@@ -43787,28 +43821,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22398, 22539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1317),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(345))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} - {rhs})".to_string())),
@@ -43824,28 +43858,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22541, 22682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1316),
+            id: DeclarationId(1318),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} * {rhs})".to_string())),
@@ -43861,28 +43895,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22684, 22825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1319),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
@@ -43900,28 +43934,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22827, 22975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1320),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -43937,28 +43971,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22977, 23117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1321),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -43974,28 +44008,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1322),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -44011,28 +44045,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23268, 23415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1323),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -44048,28 +44082,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23417, 23578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1324),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -44085,28 +44119,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23580, 23720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1325),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -44122,28 +44156,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1326),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -44159,28 +44193,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23871, 24018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1327),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -44196,28 +44230,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24020, 24181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1328),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} < {rhs})".to_string())),
@@ -44233,28 +44267,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24183, 24322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1329),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} <= {rhs})".to_string())),
@@ -44270,28 +44304,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24324, 24464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1330),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(357))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} > {rhs})".to_string())),
@@ -44307,28 +44341,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24466, 24605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1331),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(358))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} >= {rhs})".to_string())),
@@ -44344,28 +44378,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24607, 24747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1332),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(366))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(368))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} && {rhs})".to_string())),
@@ -44381,28 +44415,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24749, 24898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1333),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(367))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(369))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} || {rhs})".to_string())),
@@ -44418,26 +44452,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24900, 25049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1334),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1241)),
+                        FieldValue::Reference(DeclarationId(1243)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44456,26 +44490,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25051, 25184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1335),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1239)),
+                        FieldValue::Reference(DeclarationId(1241)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44494,26 +44528,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25186, 25329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1336),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1242)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44532,31 +44566,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25331, 25484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1337),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(667)),
+                        FieldValue::Reference(DeclarationId(669)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2198),
+                            constructor: DeclarationId(2200),
                             payload: vec![],
                         },
                     ),
@@ -44572,31 +44606,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25486, 25624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1338),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(671)),
+                        FieldValue::Reference(DeclarationId(673)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2199),
+                            constructor: DeclarationId(2201),
                             payload: vec![],
                         },
                     ),
@@ -44610,7 +44644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2189),
+                                    constructor: DeclarationId(2191),
                                     payload: vec![],
                                 },
                             ),
@@ -44627,31 +44661,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1339),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(669)),
+                        FieldValue::Reference(DeclarationId(671)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -44666,7 +44700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -44679,7 +44713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -44697,31 +44731,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1340),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(679)),
+                        FieldValue::Reference(DeclarationId(681)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![],
                         },
                     ),
@@ -44736,7 +44770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -44749,7 +44783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -44767,31 +44801,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1341),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
+                        FieldValue::Reference(DeclarationId(691)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2202),
+                            constructor: DeclarationId(2204),
                             payload: vec![],
                         },
                     ),
@@ -44805,7 +44839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2188),
+                                    constructor: DeclarationId(2190),
                                     payload: vec![],
                                 },
                             ),
@@ -44822,26 +44856,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1342),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44858,22 +44892,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1343),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
@@ -44896,26 +44930,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1344),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(135)),
+                        FieldValue::Reference(DeclarationId(137)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44932,31 +44966,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1345),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(691)),
+                        FieldValue::Reference(DeclarationId(693)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2203),
+                            constructor: DeclarationId(2205),
                             payload: vec![],
                         },
                     ),
@@ -44970,7 +45004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2188),
+                                    constructor: DeclarationId(2190),
                                     payload: vec![],
                                 },
                             ),
@@ -44987,31 +45021,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1346),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(673)),
+                        FieldValue::Reference(DeclarationId(675)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2204),
+                            constructor: DeclarationId(2206),
                             payload: vec![],
                         },
                     ),
@@ -45026,7 +45060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45039,7 +45073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -45052,7 +45086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45070,31 +45104,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1347),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(681)),
+                        FieldValue::Reference(DeclarationId(683)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2205),
+                            constructor: DeclarationId(2207),
                             payload: vec![],
                         },
                     ),
@@ -45109,7 +45143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45122,7 +45156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45140,31 +45174,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1348),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(684)),
+                        FieldValue::Reference(DeclarationId(686)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2206),
+                            constructor: DeclarationId(2208),
                             payload: vec![],
                         },
                     ),
@@ -45179,7 +45213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45192,7 +45226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45210,31 +45244,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28233, 28456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1349),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
+                        FieldValue::Reference(DeclarationId(701)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2207),
+                            constructor: DeclarationId(2209),
                             payload: vec![],
                         },
                     ),
@@ -45249,7 +45283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45262,7 +45296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -45280,41 +45314,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28458, 28687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1350),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1001),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1001)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2209),
+                            constructor: DeclarationId(2211),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1683)),
+                        FieldValue::Reference(DeclarationId(1685)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1685)),
+                        FieldValue::Reference(DeclarationId(1687)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -45347,15 +45381,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28774, 29080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1351),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1003),
+                template: DeclarationId(1005),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1003)),
+            meta_tag: Some(DeclarationId(1005)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45377,15 +45411,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29082, 29212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1352),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1004),
+                template: DeclarationId(1006),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1004)),
+            meta_tag: Some(DeclarationId(1006)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45411,15 +45445,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29214, 29374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1353),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1006),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1006)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45456,15 +45490,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29376, 29577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1354),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1007),
+                template: DeclarationId(1009),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1007)),
+            meta_tag: Some(DeclarationId(1009)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45488,15 +45522,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29579, 29689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1355),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1008),
+                template: DeclarationId(1010),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1008)),
+            meta_tag: Some(DeclarationId(1010)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45510,15 +45544,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29691, 29748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1356),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1009),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1009)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45556,15 +45590,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29750, 30035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1357),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1010),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1010)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45578,15 +45612,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30037, 30116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1358),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1011),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1011)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45622,15 +45656,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30118, 30341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1359),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1013),
+                template: DeclarationId(1015),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1013)),
+            meta_tag: Some(DeclarationId(1015)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45676,54 +45710,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30343, 30635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1360),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1014),
+                template: DeclarationId(1016),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1014)),
+            meta_tag: Some(DeclarationId(1016)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1026)),
+                        FieldValue::Reference(DeclarationId(1028)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1027)),
+                        FieldValue::Reference(DeclarationId(1029)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1028)),
+                        FieldValue::Reference(DeclarationId(1030)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1029)),
+                        FieldValue::Reference(DeclarationId(1031)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1031)),
+                        FieldValue::Reference(DeclarationId(1033)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1034)),
+                        FieldValue::Reference(DeclarationId(1036)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1032)),
+                        FieldValue::Reference(DeclarationId(1034)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1033)),
+                        FieldValue::Reference(DeclarationId(1035)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1030)),
+                        FieldValue::Reference(DeclarationId(1032)),
                     ),
                     (
                         "filter".to_string(),
@@ -45760,15 +45794,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30637, 31402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1361),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1015),
+                template: DeclarationId(1017),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1015)),
+            meta_tag: Some(DeclarationId(1017)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45804,15 +45838,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 31404, 31672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1362),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1012),
+                template: DeclarationId(1014),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1012)),
+            meta_tag: Some(DeclarationId(1014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45832,66 +45866,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 32429, 32544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1363),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1019),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1019)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1349)),
+                        FieldValue::Reference(DeclarationId(1351)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1350)),
+                        FieldValue::Reference(DeclarationId(1352)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1351)),
+                        FieldValue::Reference(DeclarationId(1353)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1352)),
+                        FieldValue::Reference(DeclarationId(1354)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1353)),
+                        FieldValue::Reference(DeclarationId(1355)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1354)),
+                        FieldValue::Reference(DeclarationId(1356)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1355)),
+                        FieldValue::Reference(DeclarationId(1357)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1356)),
+                        FieldValue::Reference(DeclarationId(1358)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1360)),
+                        FieldValue::Reference(DeclarationId(1362)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1357)),
+                        FieldValue::Reference(DeclarationId(1359)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1358)),
+                        FieldValue::Reference(DeclarationId(1360)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1359)),
+                        FieldValue::Reference(DeclarationId(1361)),
                     ),
                 ],
             }),
@@ -45900,15 +45934,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 32546, 32965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1364),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(902),
+                template: DeclarationId(904),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(902)),
+            meta_tag: Some(DeclarationId(904)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45936,15 +45970,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34632, 34768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1365),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(893),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(893)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45952,55 +45986,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2034),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2037),
+                            constructor: DeclarationId(2039),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2040),
+                            constructor: DeclarationId(2042),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2043),
+                            constructor: DeclarationId(2045),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2047),
+                            constructor: DeclarationId(2049),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2049),
+                            constructor: DeclarationId(2051),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2053),
+                            constructor: DeclarationId(2055),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -46026,7 +46060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2056),
+                                    constructor: DeclarationId(2058),
                                     payload: vec![],
                                 },
                             ),
@@ -46039,26 +46073,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34770, 35328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1366),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(894),
+                template: DeclarationId(896),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(894)),
+            meta_tag: Some(DeclarationId(896)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1363)),
+                        FieldValue::Reference(DeclarationId(1365)),
                     ),
                 ],
             }),
@@ -46067,15 +46101,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 35330, 35454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1367),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1003),
+                template: DeclarationId(1005),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1003)),
+            meta_tag: Some(DeclarationId(1005)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46095,15 +46129,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2347, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1368),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1004),
+                template: DeclarationId(1006),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1004)),
+            meta_tag: Some(DeclarationId(1006)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46129,15 +46163,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2471, 2624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1369),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1006),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1006)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46174,15 +46208,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2626, 2841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1370),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1007),
+                template: DeclarationId(1009),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1007)),
+            meta_tag: Some(DeclarationId(1009)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46206,15 +46240,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2843, 2957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1371),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1008),
+                template: DeclarationId(1010),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1008)),
+            meta_tag: Some(DeclarationId(1010)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46228,15 +46262,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2959, 3020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1372),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1009),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1009)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46274,15 +46308,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3022, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1373),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1010),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1010)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46298,15 +46332,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3331, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1374),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1011),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1011)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46346,15 +46380,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3432, 3763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1375),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1013),
+                template: DeclarationId(1015),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1013)),
+            meta_tag: Some(DeclarationId(1015)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46400,54 +46434,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3765, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1376),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1014),
+                template: DeclarationId(1016),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1014)),
+            meta_tag: Some(DeclarationId(1016)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1130)),
+                        FieldValue::Reference(DeclarationId(1132)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1131)),
+                        FieldValue::Reference(DeclarationId(1133)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1132)),
+                        FieldValue::Reference(DeclarationId(1134)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1133)),
+                        FieldValue::Reference(DeclarationId(1135)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1135)),
+                        FieldValue::Reference(DeclarationId(1137)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1138)),
+                        FieldValue::Reference(DeclarationId(1140)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1136)),
+                        FieldValue::Reference(DeclarationId(1138)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1137)),
+                        FieldValue::Reference(DeclarationId(1139)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1134)),
+                        FieldValue::Reference(DeclarationId(1136)),
                     ),
                     (
                         "filter".to_string(),
@@ -46478,15 +46512,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4097, 4861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1377),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1015),
+                template: DeclarationId(1017),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1015)),
+            meta_tag: Some(DeclarationId(1017)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46518,15 +46552,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4863, 5115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1378),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1012),
+                template: DeclarationId(1014),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1012)),
+            meta_tag: Some(DeclarationId(1014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46546,66 +46580,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1379),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1019),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1019)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1365)),
+                        FieldValue::Reference(DeclarationId(1367)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1366)),
+                        FieldValue::Reference(DeclarationId(1368)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1367)),
+                        FieldValue::Reference(DeclarationId(1369)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1368)),
+                        FieldValue::Reference(DeclarationId(1370)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1369)),
+                        FieldValue::Reference(DeclarationId(1371)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1370)),
+                        FieldValue::Reference(DeclarationId(1372)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1371)),
+                        FieldValue::Reference(DeclarationId(1373)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1372)),
+                        FieldValue::Reference(DeclarationId(1374)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1376)),
+                        FieldValue::Reference(DeclarationId(1378)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1373)),
+                        FieldValue::Reference(DeclarationId(1375)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1374)),
+                        FieldValue::Reference(DeclarationId(1376)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1375)),
+                        FieldValue::Reference(DeclarationId(1377)),
                     ),
                 ],
             }),
@@ -46614,15 +46648,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5439, 5914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1380),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46630,14 +46664,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2099),
+                            constructor: DeclarationId(2101),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2102),
+                            constructor: DeclarationId(2104),
                             payload: vec![],
                         },
                     ),
@@ -46648,22 +46682,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5916, 6013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1381),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(931)),
+                        FieldValue::Reference(DeclarationId(933)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -46676,15 +46710,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1382),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46697,22 +46731,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6153, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1383),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
@@ -46738,22 +46772,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6234, 6370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1384),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -46766,17 +46800,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1778),
+                                constructor: DeclarationId(1780),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1777),
+                                        constructor: DeclarationId(1779),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1775),
+                                            constructor: DeclarationId(1777),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -46788,7 +46822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1381)),
+                        FieldValue::Reference(DeclarationId(1383)),
                     ),
                 ],
             }),
@@ -46797,22 +46831,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6463, 6772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1385),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -46825,16 +46859,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1779),
+                                constructor: DeclarationId(1781),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1381)),
+                        FieldValue::Reference(DeclarationId(1383)),
                     ),
                 ],
             }),
@@ -46843,26 +46877,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6850, 7060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1386),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46884,26 +46918,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7062, 7201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1387),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46925,26 +46959,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7203, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1388),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46966,26 +47000,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7347, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1389),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47007,26 +47041,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7495, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1390),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47048,26 +47082,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7643, 7810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1391),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1243)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47089,26 +47123,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7812, 7981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1392),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(157)),
+                        FieldValue::Reference(DeclarationId(159)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47130,26 +47164,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7983, 8142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1393),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(760)),
+                        FieldValue::Reference(DeclarationId(762)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47171,26 +47205,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8144, 8294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1394),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(789)),
+                        FieldValue::Reference(DeclarationId(791)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47212,26 +47246,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8296, 8455),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1395),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(799)),
+                        FieldValue::Reference(DeclarationId(801)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47253,26 +47287,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8457, 8613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1396),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(800)),
+                        FieldValue::Reference(DeclarationId(802)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47294,26 +47328,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8615, 8783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1397),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(802)),
+                        FieldValue::Reference(DeclarationId(804)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47335,26 +47369,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8785, 8944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1398),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(803)),
+                        FieldValue::Reference(DeclarationId(805)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47376,26 +47410,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8946, 9099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1399),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(805)),
+                        FieldValue::Reference(DeclarationId(807)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47417,26 +47451,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9101, 9254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1400),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(806)),
+                        FieldValue::Reference(DeclarationId(808)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47458,26 +47492,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9256, 9408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1401),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(807)),
+                        FieldValue::Reference(DeclarationId(809)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47499,26 +47533,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9410, 9547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1402),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1116)),
+                        FieldValue::Reference(DeclarationId(1118)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47538,7 +47572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -47561,26 +47595,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9621, 9870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1403),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1129)),
+                        FieldValue::Reference(DeclarationId(1131)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47602,26 +47636,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9872, 10034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1404),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1117)),
+                        FieldValue::Reference(DeclarationId(1119)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47642,7 +47676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47661,7 +47695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47682,7 +47716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -47706,26 +47740,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10036, 10442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1405),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1118)),
+                        FieldValue::Reference(DeclarationId(1120)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47746,7 +47780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47765,7 +47799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47789,26 +47823,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10444, 10761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1406),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1119)),
+                        FieldValue::Reference(DeclarationId(1121)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47829,7 +47863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47848,7 +47882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -47867,7 +47901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47891,26 +47925,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10763, 11173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1405),
+            id: DeclarationId(1407),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1120)),
+                        FieldValue::Reference(DeclarationId(1122)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47932,26 +47966,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11175, 11346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1408),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1121)),
+                        FieldValue::Reference(DeclarationId(1123)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47973,26 +48007,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11348, 11510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1409),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1122)),
+                        FieldValue::Reference(DeclarationId(1124)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48013,7 +48047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -48032,7 +48066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -48051,7 +48085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -48075,26 +48109,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11512, 11931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1410),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1123)),
+                        FieldValue::Reference(DeclarationId(1125)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48115,7 +48149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -48136,7 +48170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -48155,7 +48189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -48174,7 +48208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -48198,26 +48232,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11933, 12426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1411),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1124)),
+                        FieldValue::Reference(DeclarationId(1126)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48238,7 +48272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -48257,7 +48291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -48276,7 +48310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -48300,26 +48334,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12428, 12842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1412),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1125)),
+                        FieldValue::Reference(DeclarationId(1127)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48340,7 +48374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -48359,7 +48393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -48378,7 +48412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -48402,26 +48436,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12844, 13270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1413),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1126)),
+                        FieldValue::Reference(DeclarationId(1128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48443,26 +48477,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13272, 13443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1414),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1127)),
+                        FieldValue::Reference(DeclarationId(1129)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48484,26 +48518,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13445, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1415),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1128)),
+                        FieldValue::Reference(DeclarationId(1130)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48525,28 +48559,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13618, 13780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1416),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(344))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(346))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} + {rhs})".to_string())),
@@ -48562,28 +48596,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13782, 13931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1417),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(345))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} - {rhs})".to_string())),
@@ -48599,28 +48633,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13933, 14082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1418),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} * {rhs})".to_string())),
@@ -48636,28 +48670,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14084, 14233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1419),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
@@ -48675,28 +48709,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14235, 14394),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1420),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -48712,28 +48746,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14396, 14544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1421),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -48749,28 +48783,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1422),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -48786,28 +48820,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1423),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -48823,28 +48857,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14860, 15029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1424),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -48860,28 +48894,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15031, 15179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1425),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} < {rhs})".to_string())),
@@ -48897,28 +48931,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15181, 15328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1426),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} <= {rhs})".to_string())),
@@ -48934,28 +48968,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15330, 15478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1425),
+            id: DeclarationId(1427),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(357))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} > {rhs})".to_string())),
@@ -48971,28 +49005,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15480, 15627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1426),
+            id: DeclarationId(1428),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(358))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} >= {rhs})".to_string())),
@@ -49008,28 +49042,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15629, 15777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1429),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(366))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(368))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} and {rhs})".to_string())),
@@ -49045,28 +49079,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15779, 15937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1430),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(367))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(369))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} or {rhs})".to_string())),
@@ -49082,31 +49116,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15939, 16096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1431),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(667)),
+                        FieldValue::Reference(DeclarationId(669)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2198),
+                            constructor: DeclarationId(2200),
                             payload: vec![],
                         },
                     ),
@@ -49122,31 +49156,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16098, 16244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1432),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(671)),
+                        FieldValue::Reference(DeclarationId(673)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2199),
+                            constructor: DeclarationId(2201),
                             payload: vec![],
                         },
                     ),
@@ -49160,7 +49194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2189),
+                                    constructor: DeclarationId(2191),
                                     payload: vec![],
                                 },
                             ),
@@ -49177,31 +49211,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1433),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(669)),
+                        FieldValue::Reference(DeclarationId(671)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -49216,7 +49250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -49229,7 +49263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -49247,31 +49281,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1434),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(679)),
+                        FieldValue::Reference(DeclarationId(681)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![],
                         },
                     ),
@@ -49286,7 +49320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -49299,7 +49333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -49317,31 +49351,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1435),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
+                        FieldValue::Reference(DeclarationId(691)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2202),
+                            constructor: DeclarationId(2204),
                             payload: vec![],
                         },
                     ),
@@ -49355,7 +49389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2188),
+                                    constructor: DeclarationId(2190),
                                     payload: vec![],
                                 },
                             ),
@@ -49372,31 +49406,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1436),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(691)),
+                        FieldValue::Reference(DeclarationId(693)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2203),
+                            constructor: DeclarationId(2205),
                             payload: vec![],
                         },
                     ),
@@ -49410,7 +49444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2188),
+                                    constructor: DeclarationId(2190),
                                     payload: vec![],
                                 },
                             ),
@@ -49427,31 +49461,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1437),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(673)),
+                        FieldValue::Reference(DeclarationId(675)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2204),
+                            constructor: DeclarationId(2206),
                             payload: vec![],
                         },
                     ),
@@ -49466,7 +49500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49479,7 +49513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -49492,7 +49526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49510,31 +49544,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1438),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(681)),
+                        FieldValue::Reference(DeclarationId(683)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2205),
+                            constructor: DeclarationId(2207),
                             payload: vec![],
                         },
                     ),
@@ -49549,7 +49583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49562,7 +49596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49580,31 +49614,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1439),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(684)),
+                        FieldValue::Reference(DeclarationId(686)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2206),
+                            constructor: DeclarationId(2208),
                             payload: vec![],
                         },
                     ),
@@ -49619,7 +49653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49632,7 +49666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49650,31 +49684,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17790, 18021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1440),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
+                        FieldValue::Reference(DeclarationId(701)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2207),
+                            constructor: DeclarationId(2209),
                             payload: vec![],
                         },
                     ),
@@ -49689,7 +49723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49702,7 +49736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -49720,26 +49754,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18023, 18260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1441),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49755,28 +49789,28 @@ 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(1440), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(999), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(999)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1377))), ("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(1442), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1001), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1001)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1379))), ("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(1441),
+            id: DeclarationId(1443),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(705)),
+                        FieldValue::Reference(DeclarationId(707)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49795,26 +49829,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18855, 19029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1444),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(707)),
+                        FieldValue::Reference(DeclarationId(709)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49833,41 +49867,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19031, 19217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1445),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1001),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1001)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2209),
+                            constructor: DeclarationId(2211),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1683)),
+                        FieldValue::Reference(DeclarationId(1685)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1685)),
+                        FieldValue::Reference(DeclarationId(1687)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -49900,15 +49934,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19218, 19532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1446),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(902),
+                template: DeclarationId(904),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(902)),
+            meta_tag: Some(DeclarationId(904)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49936,15 +49970,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21597, 21739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1447),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(893),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(893)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49952,55 +49986,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2034),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2041),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2040),
+                            constructor: DeclarationId(2042),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2043),
+                            constructor: DeclarationId(2045),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2047),
+                            constructor: DeclarationId(2049),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2048),
+                            constructor: DeclarationId(2050),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2053),
+                            constructor: DeclarationId(2055),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1444)),
+                        FieldValue::Reference(DeclarationId(1446)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -50029,7 +50063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2055),
+                                    constructor: DeclarationId(2057),
                                     payload: vec![],
                                 },
                             ),
@@ -50042,26 +50076,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21741, 22321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1448),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(894),
+                template: DeclarationId(896),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(894)),
+            meta_tag: Some(DeclarationId(896)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1377)),
+                        FieldValue::Reference(DeclarationId(1379)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                 ],
             }),
@@ -50070,15 +50104,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 22323, 22459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1449),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50086,14 +50120,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2101),
+                            constructor: DeclarationId(2103),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2102),
+                            constructor: DeclarationId(2104),
                             payload: vec![],
                         },
                     ),
@@ -50104,22 +50138,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5045, 5147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1450),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(931)),
+                        FieldValue::Reference(DeclarationId(933)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -50134,15 +50168,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5149, 5301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1451),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -50155,22 +50189,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5303, 5378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1452),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50196,22 +50230,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5829, 5961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1453),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50237,22 +50271,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5963, 6098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1454),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50278,22 +50312,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6100, 6234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1455),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50319,22 +50353,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6236, 6371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1456),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50360,22 +50394,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6373, 6510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1457),
             name: Some("rust_u128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50401,22 +50435,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6802, 6940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1458),
             name: Some("rust_isize".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50442,22 +50476,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7343, 7487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1459),
             name: Some("rust_usize".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -50483,22 +50517,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7489, 7634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1460),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50511,15 +50545,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1778),
+                                constructor: DeclarationId(1780),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int("0".to_string())),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1777),
+                                        constructor: DeclarationId(1779),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1775),
+                                            constructor: DeclarationId(1777),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -50531,7 +50565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1453)),
+                        FieldValue::Reference(DeclarationId(1455)),
                     ),
                 ],
             }),
@@ -50540,22 +50574,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8055, 8354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1461),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50568,17 +50602,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1778),
+                                constructor: DeclarationId(1780),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1777),
+                                        constructor: DeclarationId(1779),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1775),
+                                            constructor: DeclarationId(1777),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -50590,7 +50624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1452)),
+                        FieldValue::Reference(DeclarationId(1454)),
                     ),
                 ],
             }),
@@ -50599,22 +50633,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8356, 8663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1462),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50627,13 +50661,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2182),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1452)),
+                        FieldValue::Reference(DeclarationId(1454)),
                     ),
                 ],
             }),
@@ -50642,22 +50676,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8665, 8870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1463),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50670,13 +50704,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2182),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1452)),
                     ),
                 ],
             }),
@@ -50685,22 +50719,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8872, 9075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1464),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50713,13 +50747,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2182),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1454)),
+                        FieldValue::Reference(DeclarationId(1456)),
                     ),
                 ],
             }),
@@ -50728,22 +50762,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9077, 9286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1465),
             name: Some("rust_integer_inhabit_u128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50756,13 +50790,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2182),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1457)),
                     ),
                 ],
             }),
@@ -50771,22 +50805,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9711, 9922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1466),
             name: Some("rust_integer_inhabit_isize_platform".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50799,13 +50833,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1456)),
+                        FieldValue::Reference(DeclarationId(1458)),
                     ),
                 ],
             }),
@@ -50814,22 +50848,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10285, 10502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1467),
             name: Some("rust_integer_inhabit_usize_platform".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50842,13 +50876,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1457)),
+                        FieldValue::Reference(DeclarationId(1459)),
                     ),
                 ],
             }),
@@ -50857,26 +50891,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10504, 10723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1468),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50898,26 +50932,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10725, 10860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1469),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50939,26 +50973,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10862, 11004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1470),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50980,26 +51014,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11006, 11148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1471),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51021,26 +51055,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11150, 11292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1472),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51062,26 +51096,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11294, 11457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1473),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(704)),
+                        FieldValue::Reference(DeclarationId(706)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51103,26 +51137,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11459, 11610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1474),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(758)),
+                        FieldValue::Reference(DeclarationId(760)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51142,7 +51176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -51165,26 +51199,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11612, 11857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1475),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(759)),
+                        FieldValue::Reference(DeclarationId(761)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51206,26 +51240,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11859, 12011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1476),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(760)),
+                        FieldValue::Reference(DeclarationId(762)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51246,7 +51280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51265,7 +51299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -51286,7 +51320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -51310,26 +51344,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12013, 12409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1477),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(157)),
+                        FieldValue::Reference(DeclarationId(159)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51350,7 +51384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -51369,7 +51403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -51388,7 +51422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -51412,26 +51446,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12411, 12809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1478),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(761)),
+                        FieldValue::Reference(DeclarationId(763)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51453,26 +51487,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12811, 12969),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1479),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(762)),
+                        FieldValue::Reference(DeclarationId(764)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51494,26 +51528,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12971, 13129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1480),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(769)),
+                        FieldValue::Reference(DeclarationId(771)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51535,26 +51569,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13131, 13304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1481),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(765)),
+                        FieldValue::Reference(DeclarationId(767)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51576,26 +51610,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13306, 13454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1482),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(763)),
+                        FieldValue::Reference(DeclarationId(765)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51619,26 +51653,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13456, 13645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1483),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(764)),
+                        FieldValue::Reference(DeclarationId(766)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51660,26 +51694,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13647, 13811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1484),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(770)),
+                        FieldValue::Reference(DeclarationId(772)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51700,7 +51734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -51719,7 +51753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -51743,26 +51777,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13813, 14115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1485),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(771)),
+                        FieldValue::Reference(DeclarationId(773)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51785,7 +51819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -51804,7 +51838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -51828,26 +51862,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14117, 14458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1486),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(779)),
+                        FieldValue::Reference(DeclarationId(781)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51870,7 +51904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -51889,7 +51923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -51913,26 +51947,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14460, 14805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1487),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(780)),
+                        FieldValue::Reference(DeclarationId(782)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51954,7 +51988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -51977,26 +52011,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14807, 15083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1488),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(772)),
+                        FieldValue::Reference(DeclarationId(774)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52019,7 +52053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -52038,7 +52072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -52062,26 +52096,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15085, 15402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1489),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(705)),
+                        FieldValue::Reference(DeclarationId(707)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52102,7 +52136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -52121,7 +52155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -52145,26 +52179,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15404, 15724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1490),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(707)),
+                        FieldValue::Reference(DeclarationId(709)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52185,7 +52219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -52204,7 +52238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -52223,7 +52257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -52247,26 +52281,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15726, 16139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1491),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(792)),
+                        FieldValue::Reference(DeclarationId(794)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52286,7 +52320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2186),
+                                    constructor: DeclarationId(2188),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -52309,26 +52343,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16141, 16382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1492),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(790)),
+                        FieldValue::Reference(DeclarationId(792)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52349,7 +52383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -52368,7 +52402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -52392,26 +52426,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16384, 16704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1493),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(791)),
+                        FieldValue::Reference(DeclarationId(793)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52431,7 +52465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2186),
+                                    constructor: DeclarationId(2188),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -52454,26 +52488,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16706, 16951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1494),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(794)),
+                        FieldValue::Reference(DeclarationId(796)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52493,7 +52527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -52516,26 +52550,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16953, 17198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1495),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(795)),
+                        FieldValue::Reference(DeclarationId(797)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52555,7 +52589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -52578,26 +52612,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17200, 17463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1496),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(796)),
+                        FieldValue::Reference(DeclarationId(798)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52618,7 +52652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -52639,7 +52673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -52663,26 +52697,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17465, 17802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1497),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(773)),
+                        FieldValue::Reference(DeclarationId(775)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52704,26 +52738,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17804, 17959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1498),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(774)),
+                        FieldValue::Reference(DeclarationId(776)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52745,26 +52779,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17961, 18113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1499),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(776)),
+                        FieldValue::Reference(DeclarationId(778)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52786,26 +52820,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18115, 18267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1500),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(777)),
+                        FieldValue::Reference(DeclarationId(779)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52827,26 +52861,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18269, 18436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1501),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(778)),
+                        FieldValue::Reference(DeclarationId(780)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52867,7 +52901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -52886,7 +52920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52907,7 +52941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -52928,7 +52962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -52949,7 +52983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -52970,7 +53004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -52991,7 +53025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -53012,7 +53046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -53033,7 +53067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -53052,7 +53086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53076,26 +53110,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18438, 19459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1502),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(781)),
+                        FieldValue::Reference(DeclarationId(783)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53117,26 +53151,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19461, 19622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1503),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(782)),
+                        FieldValue::Reference(DeclarationId(784)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53158,26 +53192,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19624, 19785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1504),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(784)),
+                        FieldValue::Reference(DeclarationId(786)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53199,26 +53233,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19787, 19939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1505),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(785)),
+                        FieldValue::Reference(DeclarationId(787)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53240,26 +53274,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19941, 20102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1506),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(786)),
+                        FieldValue::Reference(DeclarationId(788)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53281,26 +53315,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20104, 20274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1507),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(787)),
+                        FieldValue::Reference(DeclarationId(789)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53322,26 +53356,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20276, 20440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1508),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(788)),
+                        FieldValue::Reference(DeclarationId(790)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53364,7 +53398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -53385,7 +53419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -53409,26 +53443,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20442, 20797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1509),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(789)),
+                        FieldValue::Reference(DeclarationId(791)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53449,7 +53483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -53470,7 +53504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -53489,7 +53523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -53508,7 +53542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -53532,26 +53566,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20799, 21287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1510),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(797)),
+                        FieldValue::Reference(DeclarationId(799)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53573,26 +53607,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21289, 21441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1511),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(799)),
+                        FieldValue::Reference(DeclarationId(801)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53613,7 +53647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -53632,7 +53666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -53653,7 +53687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -53672,7 +53706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53693,7 +53727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -53717,26 +53751,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21443, 22216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1512),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(800)),
+                        FieldValue::Reference(DeclarationId(802)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53757,7 +53791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -53776,7 +53810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -53795,7 +53829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -53816,7 +53850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -53835,7 +53869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53859,26 +53893,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22218, 22790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1513),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(802)),
+                        FieldValue::Reference(DeclarationId(804)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53899,7 +53933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -53918,7 +53952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -53937,7 +53971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -53958,7 +53992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -53977,7 +54011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53998,7 +54032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -54022,26 +54056,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22792, 23459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1514),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(803)),
+                        FieldValue::Reference(DeclarationId(805)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54062,7 +54096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -54081,7 +54115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -54100,7 +54134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -54119,7 +54153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -54138,7 +54172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -54159,7 +54193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -54178,7 +54212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -54202,26 +54236,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23461, 24170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1515),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(805)),
+                        FieldValue::Reference(DeclarationId(807)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54242,7 +54276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -54261,7 +54295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -54282,7 +54316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -54301,7 +54335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -54320,7 +54354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -54341,7 +54375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -54362,7 +54396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -54386,26 +54420,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24172, 24932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1516),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(806)),
+                        FieldValue::Reference(DeclarationId(808)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54427,26 +54461,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24934, 25082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1517),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(807)),
+                        FieldValue::Reference(DeclarationId(809)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54469,7 +54503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -54488,7 +54522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -54507,7 +54541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -54528,7 +54562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2186),
+                                        constructor: DeclarationId(2188),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -54552,26 +54586,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25084, 25564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1518),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1116)),
+                        FieldValue::Reference(DeclarationId(1118)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54593,7 +54627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2185),
+                                    constructor: DeclarationId(2187),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -54616,26 +54650,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25777, 26037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1519),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1129)),
+                        FieldValue::Reference(DeclarationId(1131)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54659,26 +54693,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26039, 26212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1520),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1117)),
+                        FieldValue::Reference(DeclarationId(1119)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54701,7 +54735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -54720,7 +54754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -54741,7 +54775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -54765,26 +54799,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26214, 26631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1521),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1118)),
+                        FieldValue::Reference(DeclarationId(1120)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54807,7 +54841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -54826,7 +54860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -54850,26 +54884,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26633, 26961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1522),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1119)),
+                        FieldValue::Reference(DeclarationId(1121)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54892,7 +54926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -54911,7 +54945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -54930,7 +54964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -54954,26 +54988,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26963, 27384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1523),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1120)),
+                        FieldValue::Reference(DeclarationId(1122)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54997,26 +55031,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27386, 27568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1524),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1121)),
+                        FieldValue::Reference(DeclarationId(1123)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55040,26 +55074,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27570, 27743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1525),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1122)),
+                        FieldValue::Reference(DeclarationId(1124)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55082,7 +55116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -55101,7 +55135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -55120,7 +55154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -55144,26 +55178,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27745, 28175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1526),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1123)),
+                        FieldValue::Reference(DeclarationId(1125)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55186,7 +55220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -55207,7 +55241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -55226,7 +55260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -55245,7 +55279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -55269,26 +55303,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28177, 28681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1527),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1124)),
+                        FieldValue::Reference(DeclarationId(1126)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55311,7 +55345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -55330,7 +55364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -55349,7 +55383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -55373,26 +55407,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28683, 29108),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1528),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1125)),
+                        FieldValue::Reference(DeclarationId(1127)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55415,7 +55449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -55434,7 +55468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -55453,7 +55487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2185),
+                                        constructor: DeclarationId(2187),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -55477,26 +55511,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29110, 29547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1529),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1126)),
+                        FieldValue::Reference(DeclarationId(1128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55520,26 +55554,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29549, 29731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1530),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1127)),
+                        FieldValue::Reference(DeclarationId(1129)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55563,26 +55597,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29733, 29915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1531),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1128)),
+                        FieldValue::Reference(DeclarationId(1130)),
                     ),
                     (
                         "carrier".to_string(),
@@ -55606,28 +55640,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29917, 30090),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1532),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(344))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(346))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} + {rhs})".to_string())),
@@ -55643,28 +55677,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30945, 31090),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1533),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(345))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} - {rhs})".to_string())),
@@ -55680,28 +55714,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31092, 31237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1534),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} * {rhs})".to_string())),
@@ -55717,28 +55751,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31239, 31384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1535),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
@@ -55756,28 +55790,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31386, 31544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1536),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -55793,28 +55827,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31994, 32138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1537),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -55830,28 +55864,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32140, 32291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1538),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -55867,28 +55901,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32293, 32444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1539),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -55904,28 +55938,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32446, 32611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1540),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -55941,28 +55975,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32804, 32954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1541),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -55978,28 +56012,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32956, 33100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1542),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -56015,28 +56049,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33102, 33253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1543),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -56052,28 +56086,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33255, 33406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1544),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -56089,28 +56123,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33408, 33573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1545),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} < {rhs})".to_string())),
@@ -56126,28 +56160,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33575, 33718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1546),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} <= {rhs})".to_string())),
@@ -56163,28 +56197,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33720, 33864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1547),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(357))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} > {rhs})".to_string())),
@@ -56200,28 +56234,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33866, 34009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1548),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(358))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} >= {rhs})".to_string())),
@@ -56237,28 +56271,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34011, 34155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1549),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(366))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(368))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} && {rhs})".to_string())),
@@ -56274,28 +56308,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34157, 34310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1550),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(367))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(369))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} || {rhs})".to_string())),
@@ -56311,26 +56345,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34312, 34465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1551),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1241)),
+                        FieldValue::Reference(DeclarationId(1243)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56349,26 +56383,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35215, 35354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1552),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1239)),
+                        FieldValue::Reference(DeclarationId(1241)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56387,26 +56421,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35356, 35503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1553),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1242)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56426,31 +56460,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35505, 35675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1554),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(667)),
+                        FieldValue::Reference(DeclarationId(669)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2198),
+                            constructor: DeclarationId(2200),
                             payload: vec![],
                         },
                     ),
@@ -56466,31 +56500,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37052, 37194),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1555),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(671)),
+                        FieldValue::Reference(DeclarationId(673)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2199),
+                            constructor: DeclarationId(2201),
                             payload: vec![],
                         },
                     ),
@@ -56504,7 +56538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2189),
+                                    constructor: DeclarationId(2191),
                                     payload: vec![],
                                 },
                             ),
@@ -56521,31 +56555,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37196, 37392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1556),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(669)),
+                        FieldValue::Reference(DeclarationId(671)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -56560,7 +56594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -56573,7 +56607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -56591,31 +56625,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37394, 37615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1557),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(679)),
+                        FieldValue::Reference(DeclarationId(681)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![],
                         },
                     ),
@@ -56630,7 +56664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -56643,7 +56677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -56661,31 +56695,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37617, 37844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1558),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
+                        FieldValue::Reference(DeclarationId(691)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2202),
+                            constructor: DeclarationId(2204),
                             payload: vec![],
                         },
                     ),
@@ -56699,7 +56733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2188),
+                                    constructor: DeclarationId(2190),
                                     payload: vec![],
                                 },
                             ),
@@ -56716,26 +56750,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37846, 38033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1559),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56752,22 +56786,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38035, 38178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1560),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -56790,26 +56824,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38457, 38628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1561),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1111)),
+                        FieldValue::Reference(DeclarationId(1113)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56826,26 +56860,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38630, 38780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1562),
             name: Some("rust_witness_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(952)),
+                        FieldValue::Reference(DeclarationId(954)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56862,26 +56896,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38782, 38935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1563),
             name: Some("rust_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1096)),
+                        FieldValue::Reference(DeclarationId(1098)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56898,22 +56932,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38937, 39081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1564),
             name: Some("rust_monoid_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
@@ -56934,26 +56968,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39083, 39233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1565),
             name: Some("rust_lens_enforcement_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1100)),
+                        FieldValue::Reference(DeclarationId(1102)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56972,26 +57006,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39235, 39418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1566),
             name: Some("rust_enforceable_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1103)),
+                        FieldValue::Reference(DeclarationId(1105)),
                     ),
                     (
                         "carrier".to_string(),
@@ -57010,26 +57044,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39420, 39603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1567),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(135)),
+                        FieldValue::Reference(DeclarationId(137)),
                     ),
                     (
                         "carrier".to_string(),
@@ -57048,31 +57082,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39605, 39755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1568),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(691)),
+                        FieldValue::Reference(DeclarationId(693)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2203),
+                            constructor: DeclarationId(2205),
                             payload: vec![],
                         },
                     ),
@@ -57086,7 +57120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2188),
+                                    constructor: DeclarationId(2190),
                                     payload: vec![],
                                 },
                             ),
@@ -57103,31 +57137,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39757, 39949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1569),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(673)),
+                        FieldValue::Reference(DeclarationId(675)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2204),
+                            constructor: DeclarationId(2206),
                             payload: vec![],
                         },
                     ),
@@ -57142,7 +57176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57155,7 +57189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2189),
+                                        constructor: DeclarationId(2191),
                                         payload: vec![],
                                     },
                                 ),
@@ -57168,7 +57202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57186,31 +57220,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39951, 40212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1570),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(681)),
+                        FieldValue::Reference(DeclarationId(683)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2205),
+                            constructor: DeclarationId(2207),
                             payload: vec![],
                         },
                     ),
@@ -57225,7 +57259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57238,7 +57272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57256,31 +57290,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40214, 40432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1571),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(684)),
+                        FieldValue::Reference(DeclarationId(686)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2206),
+                            constructor: DeclarationId(2208),
                             payload: vec![],
                         },
                     ),
@@ -57295,7 +57329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57308,7 +57342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57326,31 +57360,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40434, 40661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1572),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
+                        FieldValue::Reference(DeclarationId(701)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2207),
+                            constructor: DeclarationId(2209),
                             payload: vec![],
                         },
                     ),
@@ -57365,7 +57399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57378,7 +57412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2188),
+                                        constructor: DeclarationId(2190),
                                         payload: vec![],
                                     },
                                 ),
@@ -57396,41 +57430,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40663, 40896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1573),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1001),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1001)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2209),
+                            constructor: DeclarationId(2211),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1683)),
+                        FieldValue::Reference(DeclarationId(1685)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1685)),
+                        FieldValue::Reference(DeclarationId(1687)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -57465,15 +57499,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41124, 41428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1574),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1003),
+                template: DeclarationId(1005),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1003)),
+            meta_tag: Some(DeclarationId(1005)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57497,15 +57531,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41430, 41568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1575),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1004),
+                template: DeclarationId(1006),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1004)),
+            meta_tag: Some(DeclarationId(1006)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57531,15 +57565,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41570, 41723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1576),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1006),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1006)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57576,15 +57610,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41725, 41915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1577),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1007),
+                template: DeclarationId(1009),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1007)),
+            meta_tag: Some(DeclarationId(1009)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57608,15 +57642,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41917, 42029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1578),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1008),
+                template: DeclarationId(1010),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1008)),
+            meta_tag: Some(DeclarationId(1010)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57630,15 +57664,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42031, 42091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1579),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1009),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1009)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57676,15 +57710,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42093, 42371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1580),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1010),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1010)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57698,15 +57732,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42373, 42461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1581),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1011),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1011)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57744,15 +57778,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42463, 42765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1582),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1012),
+                template: DeclarationId(1014),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1012)),
+            meta_tag: Some(DeclarationId(1014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57776,15 +57810,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42767, 42980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1583),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1013),
+                template: DeclarationId(1015),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1013)),
+            meta_tag: Some(DeclarationId(1015)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57834,15 +57868,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42982, 43317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1584),
             name: Some("rust_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57851,7 +57885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(254)),
+                            FieldValue::Reference(DeclarationId(256)),
                         )]),
                     ),
                     (
@@ -57864,7 +57898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -57878,7 +57912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -57889,15 +57923,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 43319, 43689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1585),
             name: Some("rust_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57906,7 +57940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(272)),
+                            FieldValue::Reference(DeclarationId(274)),
                         )]),
                     ),
                     (
@@ -57918,7 +57952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -57931,7 +57965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -57942,15 +57976,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 43691, 43985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1586),
             name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57959,7 +57993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(268)),
+                            FieldValue::Reference(DeclarationId(270)),
                         )]),
                     ),
                     (
@@ -57969,7 +58003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -57982,7 +58016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -57993,15 +58027,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44156, 44451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1587),
             name: Some("rust_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58010,7 +58044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(264)),
+                            FieldValue::Reference(DeclarationId(266)),
                         )]),
                     ),
                     (
@@ -58022,7 +58056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -58035,7 +58069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -58046,15 +58080,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44453, 44773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1588),
             name: Some("rust_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58063,7 +58097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(275)),
+                            FieldValue::Reference(DeclarationId(277)),
                         )]),
                     ),
                     (
@@ -58075,7 +58109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2216),
+                            constructor: DeclarationId(2218),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -58088,7 +58122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2217),
                             payload: vec![],
                         },
                     ),
@@ -58098,17 +58132,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/rust.dag", 44775, 45103),
         });
-        declarations.push(Declaration { id: DeclarationId(1587), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1014), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1582))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1583))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1584))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1585))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1153))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1156))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1154))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1155))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1586))), ("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", 45105, 45981) });
+        declarations.push(Declaration { id: DeclarationId(1589), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1016), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1584))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1585))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1586))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1587))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1155))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1158))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1156))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1157))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1588))), ("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", 45105, 45981) });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1590),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1015),
+                template: DeclarationId(1017),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1015)),
+            meta_tag: Some(DeclarationId(1017)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58144,15 +58178,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 45983, 46255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1591),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(1018),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(1018)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58160,14 +58194,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2210),
+                            constructor: DeclarationId(2212),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2212),
+                            constructor: DeclarationId(2214),
                             payload: vec![],
                         },
                     ),
@@ -58178,66 +58212,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46257, 46338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1592),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1019),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1019)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1572)),
+                        FieldValue::Reference(DeclarationId(1574)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1573)),
+                        FieldValue::Reference(DeclarationId(1575)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1574)),
+                        FieldValue::Reference(DeclarationId(1576)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1576)),
+                        FieldValue::Reference(DeclarationId(1578)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1577)),
+                        FieldValue::Reference(DeclarationId(1579)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1578)),
+                        FieldValue::Reference(DeclarationId(1580)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1579)),
+                        FieldValue::Reference(DeclarationId(1581)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1580)),
+                        FieldValue::Reference(DeclarationId(1582)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1581)),
+                        FieldValue::Reference(DeclarationId(1583)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1587)),
+                        FieldValue::Reference(DeclarationId(1589)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1588)),
+                        FieldValue::Reference(DeclarationId(1590)),
                     ),
                 ],
             }),
@@ -58246,15 +58280,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46340, 46785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1593),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(902),
+                template: DeclarationId(904),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(902)),
+            meta_tag: Some(DeclarationId(904)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58282,15 +58316,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48209, 48348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1594),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(893),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(893)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58298,55 +58332,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2034),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2037),
+                            constructor: DeclarationId(2039),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2041),
+                            constructor: DeclarationId(2043),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2043),
+                            constructor: DeclarationId(2045),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2046),
+                            constructor: DeclarationId(2048),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2049),
+                            constructor: DeclarationId(2051),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2052),
+                            constructor: DeclarationId(2054),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1591)),
+                        FieldValue::Reference(DeclarationId(1593)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -58378,7 +58412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2055),
+                                    constructor: DeclarationId(2057),
                                     payload: vec![],
                                 },
                             ),
@@ -58391,26 +58425,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48350, 48963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1595),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(894),
+                template: DeclarationId(896),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(894)),
+            meta_tag: Some(DeclarationId(896)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1592)),
+                        FieldValue::Reference(DeclarationId(1594)),
                     ),
                 ],
             }),
@@ -58419,15 +58453,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48965, 49095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1596),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58443,15 +58477,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50197, 50300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1597),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58467,15 +58501,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50302, 50405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1598),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58491,30 +58525,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50407, 50534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1599),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(810)),
+                        FieldValue::Reference(DeclarationId(812)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1594)),
+                        FieldValue::Reference(DeclarationId(1596)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58523,30 +58557,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50536, 50667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1600),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(811)),
+                        FieldValue::Reference(DeclarationId(813)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1595)),
+                        FieldValue::Reference(DeclarationId(1597)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58555,30 +58589,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50669, 50800),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1601),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(812)),
+                        FieldValue::Reference(DeclarationId(814)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1596)),
+                        FieldValue::Reference(DeclarationId(1598)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58587,15 +58621,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50802, 50969),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1602),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58611,30 +58645,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 51480, 51609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1603),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(815)),
+                        FieldValue::Reference(DeclarationId(817)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1600)),
+                        FieldValue::Reference(DeclarationId(1602)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58643,15 +58677,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 51611, 51778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1604),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58667,30 +58701,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 52473, 52587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1605),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(817)),
+                        FieldValue::Reference(DeclarationId(819)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1602)),
+                        FieldValue::Reference(DeclarationId(1604)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58699,26 +58733,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 52589, 52762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1606),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(816)),
+                        FieldValue::Reference(DeclarationId(818)),
                     ),
                     (
                         "carrier".to_string(),
@@ -58740,15 +58774,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 53174, 53335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1607),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58764,30 +58798,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 53662, 53785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1608),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(813)),
+                        FieldValue::Reference(DeclarationId(815)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1605)),
+                        FieldValue::Reference(DeclarationId(1607)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58796,15 +58830,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 53787, 53957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1609),
             name: Some("rust_declaration_by_name_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58820,30 +58854,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54304, 54433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1610),
             name: Some("declaration_by_name_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(814)),
+                        FieldValue::Reference(DeclarationId(816)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1607)),
+                        FieldValue::Reference(DeclarationId(1609)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58852,15 +58886,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54435, 54611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1611),
             name: Some("rust_per_call_pattern_at_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -58876,30 +58910,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54831, 54951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1612),
             name: Some("per_call_pattern_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(908)),
+                        FieldValue::Reference(DeclarationId(910)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1609)),
+                        FieldValue::Reference(DeclarationId(1611)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                 ],
             }),
@@ -58908,12 +58942,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54953, 55129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1613),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -58927,21 +58961,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1614),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2558),
+                        ty: DeclarationId(2560),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2559),
+                        ty: DeclarationId(2561),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2560),
+                        ty: DeclarationId(2562),
                     },
                 ],
             },
@@ -58956,21 +58990,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1615),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1614),
                     },
                 ],
             },
@@ -58985,17 +59019,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1616),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1611)),
+            meta_tag: Some(DeclarationId(1613)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59009,17 +59043,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1617),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1611)),
+            meta_tag: Some(DeclarationId(1613)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59033,17 +59067,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1618),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1611)),
+            meta_tag: Some(DeclarationId(1613)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59057,17 +59091,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1619),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1611)),
+            meta_tag: Some(DeclarationId(1613)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59083,17 +59117,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1620),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1611)),
+            meta_tag: Some(DeclarationId(1613)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59107,17 +59141,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1621),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1611)),
+            meta_tag: Some(DeclarationId(1613)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59133,31 +59167,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1622),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1613),
+                template: DeclarationId(1615),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1613)),
+            meta_tag: Some(DeclarationId(1615)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1626)),
+                        FieldValue::Reference(DeclarationId(1628)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1614)),
+                        FieldValue::Reference(DeclarationId(1616)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2558),
+                            constructor: DeclarationId(2560),
                             payload: vec![],
                         },
                     ),
@@ -59168,31 +59202,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1623),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1613),
+                template: DeclarationId(1615),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1613)),
+            meta_tag: Some(DeclarationId(1615)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1627)),
+                        FieldValue::Reference(DeclarationId(1629)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1615)),
+                        FieldValue::Reference(DeclarationId(1617)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2559),
+                            constructor: DeclarationId(2561),
                             payload: vec![],
                         },
                     ),
@@ -59203,31 +59237,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1624),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1613),
+                template: DeclarationId(1615),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1613)),
+            meta_tag: Some(DeclarationId(1615)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1628)),
+                        FieldValue::Reference(DeclarationId(1630)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1616)),
+                        FieldValue::Reference(DeclarationId(1618)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2559),
+                            constructor: DeclarationId(2561),
                             payload: vec![],
                         },
                     ),
@@ -59238,31 +59272,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1625),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1613),
+                template: DeclarationId(1615),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1613)),
+            meta_tag: Some(DeclarationId(1615)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1629)),
+                        FieldValue::Reference(DeclarationId(1631)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1617)),
+                        FieldValue::Reference(DeclarationId(1619)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2559),
+                            constructor: DeclarationId(2561),
                             payload: vec![],
                         },
                     ),
@@ -59273,31 +59307,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1626),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1613),
+                template: DeclarationId(1615),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1613)),
+            meta_tag: Some(DeclarationId(1615)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1630)),
+                        FieldValue::Reference(DeclarationId(1632)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1619)),
+                        FieldValue::Reference(DeclarationId(1621)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2559),
+                            constructor: DeclarationId(2561),
                             payload: vec![],
                         },
                     ),
@@ -59308,31 +59342,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1627),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1613),
+                template: DeclarationId(1615),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1613)),
+            meta_tag: Some(DeclarationId(1615)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1631)),
+                        FieldValue::Reference(DeclarationId(1633)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1618)),
+                        FieldValue::Reference(DeclarationId(1620)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2560),
+                            constructor: DeclarationId(2562),
                             payload: vec![],
                         },
                     ),
@@ -59343,12 +59377,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1628),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1614)),
+                inputs: vec![DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1616)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -59361,12 +59395,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1629),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1615)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1617)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -59379,12 +59413,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1630),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1616)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1618)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -59397,12 +59431,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1631),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1617)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1619)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -59415,12 +59449,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1632),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1619)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1621)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -59433,17 +59467,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1633),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(807),
-                    DeclarationId(807),
-                    DeclarationId(807),
-                    DeclarationId(1019),
+                    DeclarationId(809),
+                    DeclarationId(809),
+                    DeclarationId(809),
+                    DeclarationId(1021),
                 ],
-                output: DeclarationId(228),
-                body: ArrowBody::ExternalRealization(DeclarationId(1618)),
+                output: DeclarationId(230),
+                body: ArrowBody::ExternalRealization(DeclarationId(1620)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -59456,11 +59490,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1634),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228), DeclarationId(1019)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1021)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
                     2533,
@@ -59478,11 +59512,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1635),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(2561),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(2563),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -59500,11 +59534,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1636),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(785)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(787)],
+                output: DeclarationId(230),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(579))),
             },
             type_params: vec![],
@@ -59518,11 +59552,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1637),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(785)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(787)],
+                output: DeclarationId(230),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(596))),
             },
             type_params: vec![],
@@ -59536,21 +59570,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1638),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(149),
+                        ty: DeclarationId(151),
                     },
                     Field {
                         label: "lens_file".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "generated_file".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                 ],
             },
@@ -59565,15 +59599,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1639),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59601,15 +59635,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1640),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59637,15 +59671,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2222, 2410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1641),
             name: Some("lens_cost_target_realization_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59676,15 +59710,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2412, 2649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1642),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59712,15 +59746,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2651, 2868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1643),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59748,15 +59782,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2870, 3055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1644),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59787,15 +59821,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3057, 3286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1645),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59823,15 +59857,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3288, 3501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1646),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59859,15 +59893,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4128, 4320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1647),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59895,15 +59929,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4322, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1648),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1636),
+                template: DeclarationId(1638),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1636)),
+            meta_tag: Some(DeclarationId(1638)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -59931,17 +59965,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4772, 4964),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1649),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2562),
+                        ty: DeclarationId(2564),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2563),
+                        ty: DeclarationId(2565),
                     },
                 ],
             },
@@ -59956,17 +59990,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6314, 6376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1650),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2566),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2565),
+                        ty: DeclarationId(2567),
                     },
                 ],
             },
@@ -59981,37 +60015,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6378, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1651),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2566),
+                        ty: DeclarationId(2568),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2569),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2568),
+                        ty: DeclarationId(2570),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2569),
+                        ty: DeclarationId(2571),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2572),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2571),
+                        ty: DeclarationId(2573),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2572),
+                        ty: DeclarationId(2574),
                     },
                 ],
             },
@@ -60026,21 +60060,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8020, 8162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1652),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2573),
+                        ty: DeclarationId(2575),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2574),
+                        ty: DeclarationId(2576),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2575),
+                        ty: DeclarationId(2577),
                     },
                 ],
             },
@@ -60055,17 +60089,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8879, 8945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1653),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2576),
+                        ty: DeclarationId(2578),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2577),
+                        ty: DeclarationId(2579),
                     },
                 ],
             },
@@ -60080,94 +60114,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9700, 10482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1654),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1651),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1653),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2578)),
+            meta_tag: Some(DeclarationId(2580)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2562),
+                            constructor: DeclarationId(2564),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2567),
+                            constructor: DeclarationId(2569),
                             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(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2562),
+                            constructor: DeclarationId(2564),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2568),
+                            constructor: DeclarationId(2570),
                             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(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2562),
+                            constructor: DeclarationId(2564),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2569),
+                            constructor: DeclarationId(2571),
                             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(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2562),
+                            constructor: DeclarationId(2564),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2570),
+                            constructor: DeclarationId(2572),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -60176,21 +60210,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2562),
+                            constructor: DeclarationId(2564),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2571),
+                            constructor: DeclarationId(2573),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -60201,84 +60235,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2563),
+                            constructor: DeclarationId(2565),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2567),
+                            constructor: DeclarationId(2569),
                             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(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2563),
+                            constructor: DeclarationId(2565),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2568),
+                            constructor: DeclarationId(2570),
                             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(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2563),
+                            constructor: DeclarationId(2565),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2569),
+                            constructor: DeclarationId(2571),
                             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(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2563),
+                            constructor: DeclarationId(2565),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2570),
+                            constructor: DeclarationId(2572),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -60287,21 +60321,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2576),
+                    constructor: DeclarationId(2578),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2563),
+                            constructor: DeclarationId(2565),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2571),
+                            constructor: DeclarationId(2573),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -60310,36 +60344,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2573),
+                            constructor: DeclarationId(2575),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2577),
+                    constructor: DeclarationId(2579),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2564),
+                            constructor: DeclarationId(2566),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2566),
+                            constructor: DeclarationId(2568),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2577),
+                    constructor: DeclarationId(2579),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2565),
+                            constructor: DeclarationId(2567),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2572),
+                            constructor: DeclarationId(2574),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -60351,13 +60385,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10810, 14801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(668),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(670),
                 }],
             },
             type_params: vec![],
@@ -60371,13 +60405,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(670),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(672),
                 }],
             },
             type_params: vec![],
@@ -60391,13 +60425,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(670),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(672),
                 }],
             },
             type_params: vec![],
@@ -60411,13 +60445,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(672),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(674),
                 }],
             },
             type_params: vec![],
@@ -60431,13 +60465,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(674),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(676),
                 }],
             },
             type_params: vec![],
@@ -60451,11 +60485,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(675), DeclarationId(674)],
-                output: DeclarationId(675),
+                inputs: vec![DeclarationId(677), DeclarationId(676)],
+                output: DeclarationId(677),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60469,13 +60503,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(677),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(679),
                 }],
             },
             type_params: vec![],
@@ -60489,11 +60523,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(677), DeclarationId(678)],
-                output: DeclarationId(678),
+                inputs: vec![DeclarationId(679), DeclarationId(680)],
+                output: DeclarationId(680),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60507,13 +60541,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(680),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(682),
                 }],
             },
             type_params: vec![],
@@ -60527,13 +60561,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(680),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(682),
                 }],
             },
             type_params: vec![],
@@ -60547,13 +60581,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(680),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(682),
                 }],
             },
             type_params: vec![],
@@ -60567,13 +60601,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(682),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(684),
                 }],
             },
             type_params: vec![],
@@ -60587,11 +60621,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(682)],
-                output: DeclarationId(683),
+                inputs: vec![DeclarationId(684)],
+                output: DeclarationId(685),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60605,13 +60639,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(683),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(685),
                 }],
             },
             type_params: vec![],
@@ -60625,13 +60659,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(685),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(687),
                 }],
             },
             type_params: vec![],
@@ -60645,11 +60679,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(685)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(687)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60663,13 +60697,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(685),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(687),
                 }],
             },
             type_params: vec![],
@@ -60683,13 +60717,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(687),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(689),
                 }],
             },
             type_params: vec![],
@@ -60703,13 +60737,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(688),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(690),
                 }],
             },
             type_params: vec![],
@@ -60723,11 +60757,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(687)],
-                output: DeclarationId(1671),
+                inputs: vec![DeclarationId(689)],
+                output: DeclarationId(1673),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60741,13 +60775,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(688),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(690),
                 }],
             },
             type_params: vec![],
@@ -60761,13 +60795,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(690),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(692),
                 }],
             },
             type_params: vec![],
@@ -60781,13 +60815,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(692),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(694),
                 }],
             },
             type_params: vec![],
@@ -60801,13 +60835,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(696),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(698),
                 }],
             },
             type_params: vec![],
@@ -60821,13 +60855,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
+                template: DeclarationId(695),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(694),
-                    value: DeclarationId(696),
+                    parameter: DeclarationId(696),
+                    value: DeclarationId(698),
                 }],
             },
             type_params: vec![],
@@ -60841,13 +60875,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1677),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1679),
                 }],
             },
             type_params: vec![],
@@ -60861,13 +60895,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(698),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(700),
                 }],
             },
             type_params: vec![],
@@ -60881,13 +60915,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
+                template: DeclarationId(695),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(694),
-                    value: DeclarationId(698),
+                    parameter: DeclarationId(696),
+                    value: DeclarationId(700),
                 }],
             },
             type_params: vec![],
@@ -60901,13 +60935,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1680),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1682),
                 }],
             },
             type_params: vec![],
@@ -60921,13 +60955,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(700),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(702),
                 }],
             },
             type_params: vec![],
@@ -60941,7 +60975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60955,13 +60989,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(666),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(668),
                 }],
             },
             type_params: vec![],
@@ -60975,17 +61009,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "head".to_string(),
-                        ty: DeclarationId(666),
+                        ty: DeclarationId(668),
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1684),
+                        ty: DeclarationId(1686),
                     },
                 ],
             },
@@ -61000,13 +61034,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(706),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(708),
                 }],
             },
             type_params: vec![],
@@ -61020,13 +61054,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(708),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(710),
                 }],
             },
             type_params: vec![],
@@ -61040,11 +61074,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61059,13 +61093,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61079,13 +61113,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
+                template: DeclarationId(695),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(694),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(696),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61099,13 +61133,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61119,11 +61153,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1691),
+                    DeclarationId(1693),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61138,13 +61172,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61158,13 +61192,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61178,11 +61212,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1694),
+                    DeclarationId(1696),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61197,13 +61231,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61217,11 +61251,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(196),
+                    DeclarationId(198),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61236,11 +61270,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61255,11 +61289,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61274,13 +61308,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61294,13 +61328,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(755),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(757),
                 }],
             },
             type_params: vec![],
@@ -61314,12 +61348,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61333,12 +61367,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61352,13 +61386,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(709),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(711),
                 }],
             },
             type_params: vec![],
@@ -61372,13 +61406,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(709),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(711),
                 }],
             },
             type_params: vec![],
@@ -61392,12 +61426,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1705),
+                    ty: DeclarationId(1707),
                 }],
             },
             type_params: vec![],
@@ -61411,17 +61445,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segment".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -61436,12 +61470,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "template".to_string(),
-                    ty: DeclarationId(710),
+                    ty: DeclarationId(712),
                 }],
             },
             type_params: vec![],
@@ -61455,21 +61489,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "raw".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "segment".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -61484,7 +61518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61498,12 +61532,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "key_source".to_string(),
-                    ty: DeclarationId(720),
+                    ty: DeclarationId(722),
                 }],
             },
             type_params: vec![],
@@ -61517,12 +61551,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "key_source".to_string(),
-                    ty: DeclarationId(720),
+                    ty: DeclarationId(722),
                 }],
             },
             type_params: vec![],
@@ -61536,12 +61570,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cause".to_string(),
-                    ty: DeclarationId(719),
+                    ty: DeclarationId(721),
                 }],
             },
             type_params: vec![],
@@ -61555,7 +61589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61569,12 +61603,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(716),
+                    ty: DeclarationId(718),
                 }],
             },
             type_params: vec![],
@@ -61588,12 +61622,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(717),
+                    ty: DeclarationId(719),
                 }],
             },
             type_params: vec![],
@@ -61607,7 +61641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61621,12 +61655,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "method".to_string(),
-                    ty: DeclarationId(196),
+                    ty: DeclarationId(198),
                 }],
             },
             type_params: vec![],
@@ -61640,12 +61674,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61659,12 +61693,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61678,13 +61712,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61698,12 +61732,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1721),
+                    ty: DeclarationId(1723),
                 }],
             },
             type_params: vec![],
@@ -61717,7 +61751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61731,7 +61765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61745,12 +61779,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61764,12 +61798,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "effect".to_string(),
-                    ty: DeclarationId(724),
+                    ty: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61783,17 +61817,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "method_str".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -61808,29 +61842,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "method".to_string(),
-                        ty: DeclarationId(196),
+                        ty: DeclarationId(198),
                     },
                     Field {
                         label: "raw_path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "segment".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -61845,7 +61879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61859,13 +61893,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61879,12 +61913,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1730),
+                    ty: DeclarationId(1732),
                 }],
             },
             type_params: vec![],
@@ -61898,13 +61932,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -61918,12 +61952,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1732),
+                    ty: DeclarationId(1734),
                 }],
             },
             type_params: vec![],
@@ -61937,13 +61971,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(733),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(735),
                 }],
             },
             type_params: vec![],
@@ -61957,12 +61991,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1734),
+                    ty: DeclarationId(1736),
                 }],
             },
             type_params: vec![],
@@ -61976,12 +62010,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "body".to_string(),
-                    ty: DeclarationId(734),
+                    ty: DeclarationId(736),
                 }],
             },
             type_params: vec![],
@@ -61995,13 +62029,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(734),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(736),
                 }],
             },
             type_params: vec![],
@@ -62015,12 +62049,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1737),
+                    ty: DeclarationId(1739),
                 }],
             },
             type_params: vec![],
@@ -62034,12 +62068,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(726),
+                    ty: DeclarationId(728),
                 }],
             },
             type_params: vec![],
@@ -62053,12 +62087,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(735),
+                    ty: DeclarationId(737),
                 }],
             },
             type_params: vec![],
@@ -62072,7 +62106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62086,7 +62120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62100,7 +62134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62114,7 +62148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62128,7 +62162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62142,12 +62176,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(726),
+                    ty: DeclarationId(728),
                 }],
             },
             type_params: vec![],
@@ -62161,12 +62195,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(739),
+                    ty: DeclarationId(741),
                 }],
             },
             type_params: vec![],
@@ -62180,7 +62214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62194,12 +62228,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -62213,12 +62247,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -62232,7 +62266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62246,12 +62280,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "agreement".to_string(),
-                    ty: DeclarationId(749),
+                    ty: DeclarationId(751),
                 }],
             },
             type_params: vec![],
@@ -62265,11 +62299,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(760),
+                    DeclarationId(762),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62284,11 +62318,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(806),
+                    DeclarationId(808),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62303,11 +62337,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(806),
+                    DeclarationId(808),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62322,11 +62356,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(778),
+                    DeclarationId(780),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62341,11 +62375,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(778),
+                    DeclarationId(780),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62360,11 +62394,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(734),
+                    DeclarationId(736),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62379,13 +62413,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -62399,13 +62433,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 27728, 27749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -62419,7 +62453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 27813, 27834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62433,12 +62467,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(758),
+                    ty: DeclarationId(760),
                 }],
             },
             type_params: vec![],
@@ -62452,7 +62486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62466,11 +62500,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(701),
+                    DeclarationId(703),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62485,12 +62519,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -62504,12 +62538,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1104, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(126),
+                    ty: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -62523,12 +62557,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1123, 1136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -62542,12 +62576,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1141, 1158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -62561,12 +62595,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3291, 3311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -62580,12 +62614,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3316, 3344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -62599,12 +62633,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3349, 3383),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -62618,12 +62652,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3388, 3417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -62637,7 +62671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3422, 3439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62651,12 +62685,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4063, 4070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(763),
+                    ty: DeclarationId(765),
                 }],
             },
             type_params: vec![],
@@ -62670,7 +62704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4075, 4125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62689,7 +62723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5689, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62703,12 +62737,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5738, 5747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(763),
+                    ty: DeclarationId(765),
                 }],
             },
             type_params: vec![],
@@ -62722,17 +62756,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5752, 5788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lower".to_string(),
-                        ty: DeclarationId(766),
+                        ty: DeclarationId(768),
                     },
                     Field {
                         label: "width".to_string(),
-                        ty: DeclarationId(764),
+                        ty: DeclarationId(766),
                     },
                 ],
             },
@@ -62747,7 +62781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6100, 6150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62761,12 +62795,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6155, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(765),
+                template: DeclarationId(767),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(766),
+                    parameter: DeclarationId(768),
                     value: DeclarationId(93),
                 }],
             },
@@ -62781,12 +62815,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6740, 6753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1780),
+                    ty: DeclarationId(1782),
                 }],
             },
             type_params: vec![],
@@ -62800,7 +62834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6728, 6754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62814,7 +62848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6759, 6776),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62833,7 +62867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7027, 7037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62847,7 +62881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7042, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62861,12 +62895,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7056, 7065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -62880,12 +62914,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7492, 7512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -62899,13 +62933,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7517, 7541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -62919,12 +62953,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7553, 7569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1788),
+                    ty: DeclarationId(1790),
                 }],
             },
             type_params: vec![],
@@ -62938,13 +62972,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7546, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(773),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(775),
                 }],
             },
             type_params: vec![],
@@ -62958,12 +62992,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7580, 7596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1790),
+                    ty: DeclarationId(1792),
                 }],
             },
             type_params: vec![],
@@ -62977,13 +63011,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7575, 7597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -62997,12 +63031,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7606, 7622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1792),
+                    ty: DeclarationId(1794),
                 }],
             },
             type_params: vec![],
@@ -63016,13 +63050,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7602, 7623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(773),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(775),
                 }],
             },
             type_params: vec![],
@@ -63036,17 +63070,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7686, 7702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "constructor".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1796),
                     },
                 ],
             },
@@ -63061,12 +63095,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7628, 7708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(157),
+                    ty: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -63080,13 +63114,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9321, 9350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -63100,12 +63134,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9385, 9401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1797),
+                    ty: DeclarationId(1799),
                 }],
             },
             type_params: vec![],
@@ -63119,12 +63153,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9355, 9403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -63138,13 +63172,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9408, 9436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(773),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(775),
                 }],
             },
             type_params: vec![],
@@ -63158,12 +63192,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9455, 9471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1800),
+                    ty: DeclarationId(1802),
                 }],
             },
             type_params: vec![],
@@ -63177,13 +63211,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9441, 9472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -63197,12 +63231,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9490, 9506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1802),
+                    ty: DeclarationId(1804),
                 }],
             },
             type_params: vec![],
@@ -63216,12 +63250,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9477, 9507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(775),
+                    ty: DeclarationId(777),
                 }],
             },
             type_params: vec![],
@@ -63235,12 +63269,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10761, 10784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -63254,7 +63288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10789, 10823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63268,7 +63302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63282,12 +63316,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10840, 10846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(157),
+                    ty: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -63301,12 +63335,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10851, 10871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(762),
+                    ty: DeclarationId(764),
                 }],
             },
             type_params: vec![],
@@ -63320,13 +63354,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11100, 11117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(770),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(772),
                 }],
             },
             type_params: vec![],
@@ -63340,12 +63374,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11139, 11154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1810),
+                    ty: DeclarationId(1812),
                 }],
             },
             type_params: vec![],
@@ -63359,13 +63393,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11122, 11156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(770),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(772),
                 }],
             },
             type_params: vec![],
@@ -63379,12 +63413,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11178, 11193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1812),
+                    ty: DeclarationId(1814),
                 }],
             },
             type_params: vec![],
@@ -63398,13 +63432,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11161, 11195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -63418,21 +63452,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11222, 11241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1816),
                     },
                     Field {
                         label: "output".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(776),
+                        ty: DeclarationId(778),
                     },
                 ],
             },
@@ -63447,17 +63481,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11200, 11297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "element".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(769),
+                        ty: DeclarationId(771),
                     },
                 ],
             },
@@ -63472,13 +63506,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11302, 11380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(771),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(773),
                 }],
             },
             type_params: vec![],
@@ -63492,17 +63526,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11448, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "template".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1817),
+                        ty: DeclarationId(1819),
                     },
                 ],
             },
@@ -63517,11 +63551,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11385, 11476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63536,13 +63570,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -63556,13 +63590,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(779),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(781),
                 }],
             },
             type_params: vec![],
@@ -63576,11 +63610,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11615, 11637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(703),
+                    DeclarationId(705),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63595,11 +63629,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(703),
+                    DeclarationId(705),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63614,11 +63648,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(774),
+                    DeclarationId(776),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63633,11 +63667,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(780),
+                    DeclarationId(782),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63652,13 +63686,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -63672,7 +63706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12874, 12893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63686,7 +63720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13174, 13177),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63700,7 +63734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13182, 13185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63714,7 +63748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13190, 13193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63728,7 +63762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13198, 13201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63742,7 +63776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13325, 13327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63756,7 +63790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13332, 13334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63770,7 +63804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13339, 13341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63784,7 +63818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13346, 13348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63798,7 +63832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13353, 13355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63812,7 +63846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13360, 13362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63826,7 +63860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14139, 14142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63840,12 +63874,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14147, 14149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(781),
+                    ty: DeclarationId(783),
                 }],
             },
             type_params: vec![],
@@ -63859,12 +63893,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14385, 14409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(782),
+                    ty: DeclarationId(784),
                 }],
             },
             type_params: vec![],
@@ -63878,12 +63912,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(784),
+                    ty: DeclarationId(786),
                 }],
             },
             type_params: vec![],
@@ -63897,12 +63931,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14443, 14461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -63916,12 +63950,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14648, 14671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field_label".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -63935,12 +63969,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14676, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field_label".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -63954,12 +63988,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14737, 14791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(785),
+                    ty: DeclarationId(787),
                 }],
             },
             type_params: vec![],
@@ -63973,17 +64007,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14796, 14818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -63998,12 +64032,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14943, 14995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -64017,11 +64051,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15000, 15030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(788),
+                    DeclarationId(790),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64036,13 +64070,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(794),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(796),
                 }],
             },
             type_params: vec![],
@@ -64056,13 +64090,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17185, 17216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(705),
+                template: DeclarationId(707),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(706),
-                    value: DeclarationId(795),
+                    parameter: DeclarationId(708),
+                    value: DeclarationId(797),
                 }],
             },
             type_params: vec![],
@@ -64076,12 +64110,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17240, 17270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "count".to_string(),
-                    ty: DeclarationId(702),
+                    ty: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -64095,17 +64129,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17893, 17922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cluster".to_string(),
-                        ty: DeclarationId(704),
+                        ty: DeclarationId(706),
                     },
                     Field {
                         label: "measure".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                 ],
             },
@@ -64120,11 +64154,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17927, 17974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(734),
+                    DeclarationId(736),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64139,13 +64173,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(702),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -64159,7 +64193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18332, 18344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64173,13 +64207,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18585, 18594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(789),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(791),
                 }],
             },
             type_params: vec![],
@@ -64193,11 +64227,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18652, 18668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(801),
+                    DeclarationId(803),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64212,7 +64246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64226,13 +64260,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19170, 19182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(702),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -64246,11 +64280,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19260, 19272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(734),
+                    DeclarationId(736),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64265,11 +64299,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(804),
+                    DeclarationId(806),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64284,12 +64318,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(799),
+                    ty: DeclarationId(801),
                 }],
             },
             type_params: vec![],
@@ -64303,12 +64337,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19462, 19478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(800),
+                    ty: DeclarationId(802),
                 }],
             },
             type_params: vec![],
@@ -64322,12 +64356,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19483, 19507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(802),
+                    ty: DeclarationId(804),
                 }],
             },
             type_params: vec![],
@@ -64341,12 +64375,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19512, 19530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(803),
+                    ty: DeclarationId(805),
                 }],
             },
             type_params: vec![],
@@ -64360,12 +64394,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(805),
+                    ty: DeclarationId(807),
                 }],
             },
             type_params: vec![],
@@ -64379,13 +64413,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19554, 19568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(778),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(780),
                 }],
             },
             type_params: vec![],
@@ -64399,13 +64433,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19597, 19614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(806),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(808),
                 }],
             },
             type_params: vec![],
@@ -64419,13 +64453,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19624, 19638),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(760),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(762),
                 }],
             },
             type_params: vec![],
@@ -64439,13 +64473,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19648, 19661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(796),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(798),
                 }],
             },
             type_params: vec![],
@@ -64459,12 +64493,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19674, 19687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(702),
+                    ty: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -64478,7 +64512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 25770, 25788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64492,13 +64526,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 25793, 25799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(702),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -64512,12 +64546,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 25832, 25856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1873),
+                    ty: DeclarationId(1875),
                 }],
             },
             type_params: vec![],
@@ -64531,13 +64565,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 25804, 25858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64551,13 +64585,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64571,13 +64605,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64591,13 +64625,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64611,13 +64645,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64631,13 +64665,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64651,13 +64685,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64671,13 +64705,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64691,13 +64725,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64711,13 +64745,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64731,13 +64765,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64751,13 +64785,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64771,13 +64805,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64791,13 +64825,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64811,13 +64845,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64831,13 +64865,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64851,13 +64885,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64871,13 +64905,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64891,13 +64925,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64911,13 +64945,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64931,13 +64965,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64951,13 +64985,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64971,13 +65005,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -64991,13 +65025,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65011,7 +65045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65025,7 +65059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65039,7 +65073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65053,7 +65087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65067,7 +65101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65081,7 +65115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65095,7 +65129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65109,11 +65143,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(821),
+                    DeclarationId(823),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65128,11 +65162,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(822),
+                    DeclarationId(824),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65147,7 +65181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65166,11 +65200,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65185,7 +65219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65199,12 +65233,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(827),
+                    ty: DeclarationId(829),
                 }],
             },
             type_params: vec![],
@@ -65218,7 +65252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65237,12 +65271,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(824),
+                    ty: DeclarationId(826),
                 }],
             },
             type_params: vec![],
@@ -65256,17 +65290,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "var".to_string(),
-                        ty: DeclarationId(824),
+                        ty: DeclarationId(826),
                     },
                     Field {
                         label: "degree".to_string(),
-                        ty: DeclarationId(827),
+                        ty: DeclarationId(829),
                     },
                 ],
             },
@@ -65281,13 +65315,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65301,12 +65335,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1915),
+                    ty: DeclarationId(1917),
                 }],
             },
             type_params: vec![],
@@ -65320,13 +65354,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65340,12 +65374,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1917),
+                    ty: DeclarationId(1919),
                 }],
             },
             type_params: vec![],
@@ -65359,12 +65393,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(824),
+                    ty: DeclarationId(826),
                 }],
             },
             type_params: vec![],
@@ -65378,12 +65412,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65397,13 +65431,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(32),
-                    value: DeclarationId(828),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65417,7 +65451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65431,7 +65465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65445,7 +65479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65459,7 +65493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65473,7 +65507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65487,12 +65521,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1170),
+                    ty: DeclarationId(1172),
                 }],
             },
             type_params: vec![],
@@ -65506,7 +65540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65520,7 +65554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65534,13 +65568,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(44),
-                    value: DeclarationId(844),
+                    value: DeclarationId(846),
                 }],
             },
             type_params: vec![],
@@ -65554,13 +65588,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(671),
+                template: DeclarationId(673),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(672),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(674),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65574,11 +65608,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(708)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(710)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -65592,18 +65626,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(684),
+                template: DeclarationId(686),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(685),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(687),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1668),
-                        value: DeclarationId(835),
+                        parameter: DeclarationId(1670),
+                        value: DeclarationId(837),
                     },
                 ],
             },
@@ -65618,13 +65652,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(671),
+                template: DeclarationId(673),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(672),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(674),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65637,60 +65671,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(1935),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
-                body: ArrowBody::NoBody,
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1936),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(828),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1658),
-                        value: DeclarationId(839),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
-        });
         declarations.push(Declaration {
             id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(674)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -65707,19 +65693,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(829),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1658),
-                        value: DeclarationId(865),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(1660),
+                        value: DeclarationId(841),
                     },
                 ],
             },
@@ -65731,14 +65717,14 @@ 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/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
             id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(674)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(831), DeclarationId(676)],
+                output: DeclarationId(831),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -65755,19 +65741,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(829),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(831),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1658),
-                        value: DeclarationId(865),
+                        parameter: DeclarationId(1660),
+                        value: DeclarationId(867),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                 ],
             },
@@ -65779,16 +65765,64 @@ 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/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
             id: DeclarationId(1941),
             name: None,
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(831), DeclarationId(676)],
+                output: DeclarationId(831),
+                body: ArrowBody::NoBody,
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1942),
+            name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(675),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(831),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1660),
+                        value: DeclarationId(867),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 17076, 17186),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1943),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65802,13 +65836,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65822,13 +65856,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65842,13 +65876,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65862,13 +65896,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65882,13 +65916,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65902,13 +65936,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65922,13 +65956,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65942,13 +65976,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65962,13 +65996,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -65982,13 +66016,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -66002,11 +66036,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(828)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(831), DeclarationId(830)],
+                output: DeclarationId(831),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -66020,22 +66054,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(829),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(831),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1658),
-                        value: DeclarationId(865),
+                        parameter: DeclarationId(1660),
+                        value: DeclarationId(867),
                     },
                 ],
             },
@@ -66050,13 +66084,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -66070,13 +66104,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -66090,11 +66124,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1898), DeclarationId(828)],
-                output: DeclarationId(1898),
+                inputs: vec![DeclarationId(1900), DeclarationId(830)],
+                output: DeclarationId(1900),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -66108,22 +66142,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(1898),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(1900),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1658),
-                        value: DeclarationId(868),
+                        parameter: DeclarationId(1660),
+                        value: DeclarationId(870),
                     },
                 ],
             },
@@ -66138,13 +66172,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(872),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(874),
                 }],
             },
             type_params: vec![],
@@ -66158,11 +66192,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(112),
+                    DeclarationId(115),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66177,11 +66211,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66196,13 +66230,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1161),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1163),
                 }],
             },
             type_params: vec![],
@@ -66216,13 +66250,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(876),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(878),
                 }],
             },
             type_params: vec![],
@@ -66236,12 +66270,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1962),
+                    ty: DeclarationId(1964),
                 }],
             },
             type_params: vec![],
@@ -66255,13 +66289,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(877),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(879),
                 }],
             },
             type_params: vec![],
@@ -66275,12 +66309,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1964),
+                    ty: DeclarationId(1966),
                 }],
             },
             type_params: vec![],
@@ -66294,17 +66328,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "media_type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "base64".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -66319,12 +66353,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3042, 3107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "url".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66338,12 +66372,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3112, 3136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66357,12 +66391,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3160, 3188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "source".to_string(),
-                    ty: DeclarationId(873),
+                    ty: DeclarationId(875),
                 }],
             },
             type_params: vec![],
@@ -66376,12 +66410,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3193, 3229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66395,13 +66429,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3541, 3572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(874),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(876),
                 }],
             },
             type_params: vec![],
@@ -66415,12 +66449,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3604, 3622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "blocks".to_string(),
-                    ty: DeclarationId(1971),
+                    ty: DeclarationId(1973),
                 }],
             },
             type_params: vec![],
@@ -66434,12 +66468,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3577, 3624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66453,11 +66487,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3905, 3941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(875),
+                    DeclarationId(877),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66472,11 +66506,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(126),
+                    DeclarationId(128),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66491,21 +66525,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "tool_use_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1977),
                     },
                 ],
             },
@@ -66520,12 +66554,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3946, 4064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66539,21 +66573,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4511, 4549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                 ],
             },
@@ -66568,7 +66602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4554, 4637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66582,7 +66616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4995, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66596,7 +66630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5007, 5016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66610,7 +66644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5021, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66624,7 +66658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5038, 5045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66638,7 +66672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5050, 5059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66652,7 +66686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5064, 5071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66666,11 +66700,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5076, 5102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66685,11 +66719,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66704,13 +66738,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document_index".to_string(),
@@ -66718,11 +66752,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1988),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -66745,11 +66779,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5342, 5485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66764,11 +66798,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66783,13 +66817,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document_index".to_string(),
@@ -66797,11 +66831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -66824,11 +66858,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5490, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66843,11 +66877,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66862,13 +66896,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document_index".to_string(),
@@ -66876,11 +66910,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -66903,11 +66937,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5640, 5793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66922,25 +66956,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "encrypted_index".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "url".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -66955,11 +66989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5798, 5898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -66974,21 +67008,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "source".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -67015,13 +67049,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5903, 6050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(879),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(881),
                 }],
             },
             type_params: vec![],
@@ -67035,11 +67069,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1999),
+                    DeclarationId(2001),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67054,17 +67088,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -67079,17 +67113,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6629, 6711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "thinking".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "signature".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -67104,12 +67138,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6716, 6777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "redacted_data".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -67123,11 +67157,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6782, 6837),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67142,25 +67176,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2006),
                     },
                 ],
             },
@@ -67175,11 +67209,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6842, 6919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67194,25 +67228,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(881),
+                        ty: DeclarationId(883),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2008),
                     },
                 ],
             },
@@ -67227,11 +67261,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6924, 7024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67246,21 +67280,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "tool_use_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2010),
                     },
                 ],
             },
@@ -67275,7 +67309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7029, 7115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67289,7 +67323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7336, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67303,7 +67337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7350, 7358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67317,7 +67351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7363, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67331,7 +67365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7381, 7398),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67345,7 +67379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7403, 7426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67359,7 +67393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7431, 7450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67373,7 +67407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7455, 7473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67387,7 +67421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7478, 7485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67406,7 +67440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67425,11 +67459,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67444,7 +67478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67458,13 +67492,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8193, 8202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(880),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(882),
                 }],
             },
             type_params: vec![],
@@ -67478,11 +67512,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8688, 8726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67497,11 +67531,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8805, 8812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67516,7 +67550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8873, 8878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67530,7 +67564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67544,7 +67578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67558,7 +67592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67572,7 +67606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67586,7 +67620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67600,7 +67634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67614,13 +67648,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(891),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(893),
                 }],
             },
             type_params: vec![],
@@ -67634,7 +67668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67648,7 +67682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67662,7 +67696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67676,7 +67710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67690,7 +67724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67704,7 +67738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67718,7 +67752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67732,7 +67766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67746,7 +67780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67760,7 +67794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67774,7 +67808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67788,7 +67822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67802,7 +67836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67816,7 +67850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67830,7 +67864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67844,7 +67878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67858,7 +67892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67872,7 +67906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67886,7 +67920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67900,7 +67934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67914,7 +67948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67928,13 +67962,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -67948,7 +67982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67962,7 +67996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67976,7 +68010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67990,7 +68024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68004,11 +68038,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(907),
+                    DeclarationId(909),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -68023,11 +68057,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -68042,7 +68076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68061,11 +68095,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(917),
+                    DeclarationId(919),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -68080,11 +68114,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(917),
+                    DeclarationId(919),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -68099,12 +68133,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68118,12 +68152,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1422, 1454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "witness".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68137,12 +68171,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1459, 1495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "element".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68156,12 +68190,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1500, 1537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68175,12 +68209,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1542, 1568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68194,7 +68228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1573, 1606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68208,12 +68242,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1611, 1628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1170),
+                    ty: DeclarationId(1172),
                 }],
             },
             type_params: vec![],
@@ -68227,7 +68261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1633, 1687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68241,12 +68275,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1692, 1699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "accessor".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68260,17 +68294,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2051, 2089),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1170),
+                        ty: DeclarationId(1172),
                     },
                     Field {
                         label: "collection".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -68285,17 +68319,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2094, 2168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1170),
+                        ty: DeclarationId(1172),
                     },
                     Field {
                         label: "ring_param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -68310,17 +68344,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2173, 2248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1172),
+                        ty: DeclarationId(1174),
                     },
                     Field {
                         label: "ring_param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -68335,12 +68369,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2253, 2326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "witness".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68354,12 +68388,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2331, 2368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "element".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68373,12 +68407,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2373, 2410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "outer_collection".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68392,7 +68426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2415, 2456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68406,7 +68440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2461, 2477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68420,12 +68454,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2998, 3008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1170),
+                    ty: DeclarationId(1172),
                 }],
             },
             type_params: vec![],
@@ -68439,12 +68473,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3013, 3060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1172),
+                    ty: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -68458,7 +68492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3065, 3116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68472,7 +68506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3306, 3310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68486,7 +68520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3315, 3322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68500,11 +68534,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3327, 3333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(909),
+                    DeclarationId(911),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -68519,7 +68553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68533,7 +68567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7270, 7281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68547,7 +68581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7330, 7344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68561,7 +68595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7409, 7425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68575,7 +68609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68589,7 +68623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68603,7 +68637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68617,7 +68651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68631,7 +68665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68645,7 +68679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68659,7 +68693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68673,7 +68707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68687,7 +68721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68701,7 +68735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68715,7 +68749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68729,7 +68763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68743,7 +68777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68757,13 +68791,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68777,13 +68811,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68797,7 +68831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68811,7 +68845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68825,12 +68859,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68844,7 +68878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68858,7 +68892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68872,18 +68906,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(933),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(935),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(936),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(938),
                     },
                 ],
             },
@@ -68898,7 +68932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68912,7 +68946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5539, 5543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68926,7 +68960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5546, 5552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68940,7 +68974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5555, 5557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68954,7 +68988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6373, 6377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68968,7 +69002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6380, 6384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68982,7 +69016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6387, 6391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68996,7 +69030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6394, 6399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69010,7 +69044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6402, 6413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69024,7 +69058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6416, 6429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69038,7 +69072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7009, 7014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69052,7 +69086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7017, 7026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69066,7 +69100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7029, 7035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69080,7 +69114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7038, 7042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69094,13 +69128,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7045, 7049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(942),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(944),
                 }],
             },
             type_params: vec![],
@@ -69114,13 +69148,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8443, 8461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(943),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(945),
                 }],
             },
             type_params: vec![],
@@ -69134,7 +69168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8916, 8944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69148,7 +69182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1022, 1036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69162,7 +69196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1041, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69176,7 +69210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1056, 1068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69190,7 +69224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69204,7 +69238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1091, 1103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69218,7 +69252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1108, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69232,7 +69266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69246,7 +69280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1152, 1171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69260,7 +69294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1176, 1201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69274,12 +69308,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1206, 1229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(945),
+                    ty: DeclarationId(947),
                 }],
             },
             type_params: vec![],
@@ -69293,12 +69327,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5429, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(948),
+                    ty: DeclarationId(950),
                 }],
             },
             type_params: vec![],
@@ -69312,13 +69346,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5470, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(946),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -69332,12 +69366,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5970, 5986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "unspecified_axis".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69351,7 +69385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9098, 9139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69365,13 +69399,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9436, 9448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69385,17 +69419,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9718, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2145),
                     },
                 ],
             },
@@ -69410,12 +69444,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9675, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "construct".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69429,12 +69463,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10042, 10076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "detail".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69448,7 +69482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10479, 10530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69462,21 +69496,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10873, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "connective".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "behavior".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -69491,13 +69525,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11241, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(971),
+                    value: DeclarationId(973),
                 }],
             },
             type_params: vec![],
@@ -69511,18 +69545,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(970),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(972),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(971),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(973),
                     },
                 ],
             },
@@ -69537,18 +69571,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(970),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(972),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(971),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(973),
                     },
                 ],
             },
@@ -69563,18 +69597,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(970),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(972),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(971),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(973),
                     },
                 ],
             },
@@ -69589,13 +69623,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(974),
+                    value: DeclarationId(976),
                 }],
             },
             type_params: vec![],
@@ -69609,18 +69643,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(973),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(975),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(974),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(976),
                     },
                 ],
             },
@@ -69635,18 +69669,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(973),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(975),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(974),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(976),
                     },
                 ],
             },
@@ -69661,18 +69695,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(973),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(975),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(974),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(976),
                     },
                 ],
             },
@@ -69687,13 +69721,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(977),
+                    value: DeclarationId(979),
                 }],
             },
             type_params: vec![],
@@ -69707,18 +69741,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(976),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(978),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(977),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(979),
                     },
                 ],
             },
@@ -69733,18 +69767,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(976),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(978),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(977),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(979),
                     },
                 ],
             },
@@ -69759,13 +69793,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(980),
+                    value: DeclarationId(982),
                 }],
             },
             type_params: vec![],
@@ -69779,18 +69813,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(979),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(981),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(980),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(982),
                     },
                 ],
             },
@@ -69805,18 +69839,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(979),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(981),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(980),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(982),
                     },
                 ],
             },
@@ -69831,12 +69865,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(953),
+                    ty: DeclarationId(955),
                 }],
             },
             type_params: vec![],
@@ -69850,17 +69884,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "at".to_string(),
-                        ty: DeclarationId(806),
+                        ty: DeclarationId(808),
                     },
                 ],
             },
@@ -69875,7 +69909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69889,12 +69923,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(950),
+                    ty: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -69908,13 +69942,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(956),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(958),
                 }],
             },
             type_params: vec![],
@@ -69928,13 +69962,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2167),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2169),
                 }],
             },
             type_params: vec![],
@@ -69948,21 +69982,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimension_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "composed".to_string(),
-                        ty: DeclarationId(956),
+                        ty: DeclarationId(958),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2170),
                     },
                 ],
             },
@@ -69977,13 +70011,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(950),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -69997,13 +70031,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(956),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(958),
                 }],
             },
             type_params: vec![],
@@ -70017,13 +70051,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2171),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2173),
                 }],
             },
             type_params: vec![],
@@ -70037,21 +70071,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimension_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2174),
                     },
                 ],
             },
@@ -70066,13 +70100,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(958),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(960),
                 }],
             },
             type_params: vec![],
@@ -70086,11 +70120,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(806)],
-                output: DeclarationId(2174),
+                inputs: vec![DeclarationId(809), DeclarationId(808)],
+                output: DeclarationId(2176),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -70104,13 +70138,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(958),
+                    value: DeclarationId(960),
                 }],
             },
             type_params: vec![],
@@ -70124,11 +70158,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(806), DeclarationId(958)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(808), DeclarationId(960)],
+                output: DeclarationId(956),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -70142,13 +70176,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2180),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(960),
+                    value: DeclarationId(962),
                 }],
             },
             type_params: vec![],
@@ -70162,7 +70196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70176,12 +70210,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(157),
+                    ty: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -70195,13 +70229,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(987),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(989),
                 }],
             },
             type_params: vec![],
@@ -70215,7 +70249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70229,12 +70263,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(767),
+                    ty: DeclarationId(769),
                 }],
             },
             type_params: vec![],
@@ -70248,7 +70282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70262,12 +70296,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70281,12 +70315,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70300,13 +70334,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(992),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(994),
                 }],
             },
             type_params: vec![],
@@ -70320,7 +70354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70334,7 +70368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70348,7 +70382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70362,7 +70396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70376,7 +70410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70390,7 +70424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70404,7 +70438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70418,7 +70452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70432,7 +70466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70446,7 +70480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70460,7 +70494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70474,7 +70508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70488,7 +70522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70502,7 +70536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70516,7 +70550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70530,7 +70564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70544,7 +70578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70558,7 +70592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70572,7 +70606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70586,7 +70620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70600,7 +70634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70614,7 +70648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70628,7 +70662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70642,7 +70676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70656,7 +70690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70670,7 +70704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70684,7 +70718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70698,7 +70732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70712,12 +70746,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "template".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70731,17 +70765,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inline_template".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "fn_ref_template".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -70756,13 +70790,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
@@ -70776,11 +70810,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(907),
+                    DeclarationId(909),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -70795,11 +70829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(911),
+                    DeclarationId(913),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -70814,13 +70848,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1053),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1055),
                 }],
             },
             type_params: vec![],
@@ -70834,13 +70868,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -70854,13 +70888,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -70874,13 +70908,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -70894,13 +70928,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2224),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2226),
                 }],
             },
             type_params: vec![],
@@ -70914,7 +70948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70933,7 +70967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70952,7 +70986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70971,7 +71005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70990,7 +71024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71009,7 +71043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71028,7 +71062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71042,7 +71076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71056,7 +71090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71070,7 +71104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71084,7 +71118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71098,17 +71132,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field".to_string(),
-                        ty: DeclarationId(1037),
+                        ty: DeclarationId(1039),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(909),
+                        ty: DeclarationId(911),
                     },
                 ],
             },
@@ -71123,12 +71157,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(1037),
+                    ty: DeclarationId(1039),
                 }],
             },
             type_params: vec![],
@@ -71142,17 +71176,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(909),
+                        ty: DeclarationId(911),
                     },
                 ],
             },
@@ -71167,7 +71201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71181,7 +71215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71195,7 +71229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71209,12 +71243,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1170),
+                    ty: DeclarationId(1172),
                 }],
             },
             type_params: vec![],
@@ -71228,17 +71262,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "numerator".to_string(),
-                        ty: DeclarationId(1170),
+                        ty: DeclarationId(1172),
                     },
                     Field {
                         label: "root".to_string(),
-                        ty: DeclarationId(1170),
+                        ty: DeclarationId(1172),
                     },
                 ],
             },
@@ -71253,17 +71287,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1172),
+                        ty: DeclarationId(1174),
                     },
                     Field {
                         label: "argument".to_string(),
-                        ty: DeclarationId(1170),
+                        ty: DeclarationId(1172),
                     },
                 ],
             },
@@ -71278,17 +71312,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "exponent".to_string(),
-                        ty: DeclarationId(1050),
+                        ty: DeclarationId(1052),
                     },
                 ],
             },
@@ -71303,12 +71337,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -71322,7 +71356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71336,12 +71370,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cost".to_string(),
-                    ty: DeclarationId(1052),
+                    ty: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -71355,13 +71389,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -71375,12 +71409,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2250),
+                    ty: DeclarationId(2252),
                 }],
             },
             type_params: vec![],
@@ -71394,13 +71428,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -71414,13 +71448,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2252),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2254),
                 }],
             },
             type_params: vec![],
@@ -71434,12 +71468,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2253),
+                    ty: DeclarationId(2255),
                 }],
             },
             type_params: vec![],
@@ -71453,13 +71487,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1053),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1055),
                 }],
             },
             type_params: vec![],
@@ -71473,12 +71507,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2255),
+                    ty: DeclarationId(2257),
                 }],
             },
             type_params: vec![],
@@ -71492,7 +71526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71506,7 +71540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71520,13 +71554,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1243),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -71540,13 +71574,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1243),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -71560,13 +71594,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1097),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1099),
                 }],
             },
             type_params: vec![],
@@ -71580,11 +71614,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(806)],
-                output: DeclarationId(2261),
+                inputs: vec![DeclarationId(809), DeclarationId(808)],
+                output: DeclarationId(2263),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -71598,13 +71632,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(1097),
+                    value: DeclarationId(1099),
                 }],
             },
             type_params: vec![],
@@ -71618,11 +71652,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1097), DeclarationId(1097)],
-                output: DeclarationId(1097),
+                inputs: vec![DeclarationId(1099), DeclarationId(1099)],
+                output: DeclarationId(1099),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -71636,11 +71670,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1097), DeclarationId(797)],
-                output: DeclarationId(1097),
+                inputs: vec![DeclarationId(1099), DeclarationId(799)],
+                output: DeclarationId(1099),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -71654,11 +71688,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(1097)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(809), DeclarationId(1099)],
+                output: DeclarationId(956),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -71672,12 +71706,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "declaration".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -71691,17 +71725,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "declaration".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                 ],
             },
@@ -71716,7 +71750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71730,11 +71764,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1101)],
-                output: DeclarationId(1102),
+                inputs: vec![DeclarationId(1103)],
+                output: DeclarationId(1104),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -71748,11 +71782,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1102), DeclarationId(1102)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1104), DeclarationId(1104)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -71766,13 +71800,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1096),
+                template: DeclarationId(1098),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1097),
-                    value: DeclarationId(1104),
+                    parameter: DeclarationId(1099),
+                    value: DeclarationId(1106),
                 }],
             },
             type_params: vec![],
@@ -71786,18 +71820,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1100),
+                template: DeclarationId(1102),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(1101),
-                        value: DeclarationId(1104),
+                        parameter: DeclarationId(1103),
+                        value: DeclarationId(1106),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1102),
-                        value: DeclarationId(1105),
+                        parameter: DeclarationId(1104),
+                        value: DeclarationId(1107),
                     },
                 ],
             },
@@ -71812,18 +71846,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1103),
+                template: DeclarationId(1105),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(1104),
-                        value: DeclarationId(1107),
+                        parameter: DeclarationId(1106),
+                        value: DeclarationId(1109),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1105),
-                        value: DeclarationId(1108),
+                        parameter: DeclarationId(1107),
+                        value: DeclarationId(1110),
                     },
                 ],
             },
@@ -71838,13 +71872,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1096),
+                template: DeclarationId(1098),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1097),
-                    value: DeclarationId(1110),
+                    parameter: DeclarationId(1099),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -71858,12 +71892,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
+                    parameter: DeclarationId(1114),
                     value: DeclarationId(93),
                 }],
             },
@@ -71878,12 +71912,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
+                    parameter: DeclarationId(1114),
                     value: DeclarationId(93),
                 }],
             },
@@ -71898,7 +71932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71912,12 +71946,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1112),
+                    ty: DeclarationId(1114),
                 }],
             },
             type_params: vec![],
@@ -71931,13 +71965,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1129),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1131),
                 }],
             },
             type_params: vec![],
@@ -71951,11 +71985,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1128),
+                    DeclarationId(1130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -71970,13 +72004,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1121),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1123),
                 }],
             },
             type_params: vec![],
@@ -71990,12 +72024,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2282),
+                    ty: DeclarationId(2284),
                 }],
             },
             type_params: vec![],
@@ -72009,13 +72043,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1118),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1120),
                 }],
             },
             type_params: vec![],
@@ -72029,12 +72063,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2284),
+                    ty: DeclarationId(2286),
                 }],
             },
             type_params: vec![],
@@ -72048,17 +72082,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72073,13 +72107,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1121),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1123),
                 }],
             },
             type_params: vec![],
@@ -72093,21 +72127,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72122,17 +72156,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inner".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72147,13 +72181,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1121),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1123),
                 }],
             },
             type_params: vec![],
@@ -72167,21 +72201,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "output".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72196,17 +72230,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72221,21 +72255,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72250,13 +72284,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1125),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -72270,21 +72304,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72299,12 +72333,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72318,12 +72352,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4663, 4674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(126),
+                    ty: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -72337,12 +72371,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4679, 4689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72356,17 +72390,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4694, 4708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1127),
+                        ty: DeclarationId(1129),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72381,17 +72415,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4822, 4873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72406,13 +72440,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4878, 4916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72426,13 +72460,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4944, 4956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(157),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -72446,21 +72480,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4978, 4994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2303),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72475,13 +72509,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4921, 5023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1128),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1130),
                 }],
             },
             type_params: vec![],
@@ -72495,21 +72529,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5068, 5085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72524,13 +72558,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5028, 5114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72544,13 +72578,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5685, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(157),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -72564,13 +72598,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5719, 5735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1128),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1130),
                 }],
             },
             type_params: vec![],
@@ -72584,25 +72618,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5748, 5765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72617,13 +72651,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5658, 5794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1122),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1124),
                 }],
             },
             type_params: vec![],
@@ -72637,21 +72671,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5850, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2312),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72666,13 +72700,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5799, 5903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1128),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1130),
                 }],
             },
             type_params: vec![],
@@ -72686,21 +72720,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5954, 5971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(785),
+                        ty: DeclarationId(787),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72715,13 +72749,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72735,21 +72769,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6028, 6040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2316),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72764,25 +72798,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6005, 6093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cond".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "then_branch".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "else_branch".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72797,13 +72831,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6098, 6217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1124),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1126),
                 }],
             },
             type_params: vec![],
@@ -72817,21 +72851,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6271, 6292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "scrutinee".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2319),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72846,13 +72880,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6222, 6321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1122),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1124),
                 }],
             },
             type_params: vec![],
@@ -72866,17 +72900,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6349, 6373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72891,13 +72925,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6326, 6402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1128),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1130),
                 }],
             },
             type_params: vec![],
@@ -72911,17 +72945,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6430, 6447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2323),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72936,13 +72970,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6407, 6476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1123),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1125),
                 }],
             },
             type_params: vec![],
@@ -72956,17 +72990,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8570, 8591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2325),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -72981,11 +73015,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8549, 8620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1121),
+                    DeclarationId(1123),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73000,21 +73034,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2327),
                     },
                     Field {
                         label: "expr".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                 ],
             },
@@ -73029,13 +73063,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73049,13 +73083,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9641, 9653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1117),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1119),
                 }],
             },
             type_params: vec![],
@@ -73069,33 +73103,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9668, 9686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2330),
                     },
                     Field {
                         label: "return_type".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73110,13 +73144,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9598, 9770),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73130,13 +73164,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9830, 9842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1117),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1119),
                 }],
             },
             type_params: vec![],
@@ -73150,33 +73184,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9857, 9875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2332),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "return_type".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                     Field {
                         label: "body_span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73191,11 +73225,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9775, 9963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1128),
+                    DeclarationId(1130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73210,29 +73244,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "body_span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73247,13 +73281,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9968, 10097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73267,17 +73301,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10117, 10129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73292,13 +73326,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73312,13 +73346,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73332,21 +73366,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10201, 10213),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73361,13 +73395,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10154, 10242),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73381,21 +73415,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10296, 10308),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73410,13 +73444,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10247, 10337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73430,13 +73464,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10393, 10405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1118),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1120),
                 }],
             },
             type_params: vec![],
@@ -73450,25 +73484,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10420, 10438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73483,13 +73517,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73503,13 +73537,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1119),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1121),
                 }],
             },
             type_params: vec![],
@@ -73523,11 +73557,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10549, 10569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1121),
+                    DeclarationId(1123),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73542,29 +73576,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2348),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2349),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73579,13 +73613,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10472, 10627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -73599,11 +73633,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10682, 10694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1128),
+                    DeclarationId(1130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73618,33 +73652,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2351),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1121),
+                        ty: DeclarationId(1123),
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2352),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -73659,13 +73693,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10632, 10807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
@@ -73683,13 +73717,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1143),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1145),
                 }],
             },
             type_params: vec![],
@@ -73703,12 +73737,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -73722,13 +73756,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1142),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1144),
                 }],
             },
             type_params: vec![],
@@ -73742,12 +73776,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2355),
+                    ty: DeclarationId(2357),
                 }],
             },
             type_params: vec![],
@@ -73761,17 +73795,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "tag".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1143),
+                        ty: DeclarationId(1145),
                     },
                 ],
             },
@@ -73786,12 +73820,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(701),
+                    ty: DeclarationId(703),
                 }],
             },
             type_params: vec![],
@@ -73805,12 +73839,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(797),
+                    ty: DeclarationId(799),
                 }],
             },
             type_params: vec![],
@@ -73824,18 +73858,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(702),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(704),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1143),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1145),
                     },
                 ],
             },
@@ -73850,13 +73884,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1146),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -73870,12 +73904,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "input_order".to_string(),
-                    ty: DeclarationId(1150),
+                    ty: DeclarationId(1152),
                 }],
             },
             type_params: vec![],
@@ -73889,7 +73923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73903,7 +73937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73917,13 +73951,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
@@ -73937,18 +73971,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5765, 5793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1158),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1160),
                     },
                 ],
             },
@@ -73963,11 +73997,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6801, 6824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1162),
+                    DeclarationId(1164),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73982,11 +74016,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1162),
+                    DeclarationId(1164),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74001,11 +74035,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1162),
+                    DeclarationId(1164),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74020,18 +74054,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1162),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1164),
                     },
                 ],
             },
@@ -74046,18 +74080,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1162),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1164),
                     },
                 ],
             },
@@ -74072,11 +74106,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1170),
+                    DeclarationId(1172),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74091,11 +74125,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1172),
+                    DeclarationId(1174),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74110,18 +74144,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(12),
-                        value: DeclarationId(1183),
+                        value: DeclarationId(1185),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(13),
-                        value: DeclarationId(1182),
+                        value: DeclarationId(1184),
                     },
                 ],
             },
@@ -74136,7 +74170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74150,7 +74184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74164,7 +74198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74178,12 +74212,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74197,12 +74231,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74216,12 +74250,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74235,12 +74269,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74254,12 +74288,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74273,7 +74307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74287,12 +74321,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(1170),
+                    ty: DeclarationId(1172),
                 }],
             },
             type_params: vec![],
@@ -74306,7 +74340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74320,12 +74354,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inner".to_string(),
-                    ty: DeclarationId(1172),
+                    ty: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -74339,12 +74373,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "accessor".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74358,12 +74392,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "amount".to_string(),
-                    ty: DeclarationId(1170),
+                    ty: DeclarationId(1172),
                 }],
             },
             type_params: vec![],
@@ -74377,12 +74411,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1170),
+                    ty: DeclarationId(1172),
                 }],
             },
             type_params: vec![],
@@ -74396,12 +74430,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1172),
+                    ty: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -74415,12 +74449,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "witness".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74434,12 +74468,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "element".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -74453,7 +74487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74467,13 +74501,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1169),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1171),
                 }],
             },
             type_params: vec![],
@@ -74487,13 +74521,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1162),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1164),
                 }],
             },
             type_params: vec![],
@@ -74507,7 +74541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74521,7 +74555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74535,7 +74569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74549,12 +74583,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2399),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1181),
+                    ty: DeclarationId(1183),
                 }],
             },
             type_params: vec![],
@@ -74568,7 +74602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74582,18 +74616,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1180),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1182),
                     },
                 ],
             },
@@ -74608,13 +74642,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(946),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -74628,13 +74662,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74648,12 +74682,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "duration".to_string(),
-                    ty: DeclarationId(1186),
+                    ty: DeclarationId(1188),
                 }],
             },
             type_params: vec![],
@@ -74667,7 +74701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4004, 4038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74681,7 +74715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4043, 4053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74695,7 +74729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4058, 4067),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74708,54 +74742,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4072, 4077),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2408),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1190),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: 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", 5915, 5943),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2409),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1683),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(946),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1192),
                 }],
             },
             type_params: vec![],
@@ -74766,16 +74760,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 5915, 5943),
         });
         declarations.push(Declaration {
             id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(1685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -74786,16 +74780,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962),
         });
         declarations.push(Declaration {
             id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74812,10 +74806,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74832,10 +74826,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74852,10 +74846,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74872,10 +74866,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74892,10 +74886,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74912,10 +74906,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74932,10 +74926,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2419),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2163),
+                template: DeclarationId(2165),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1187),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
                 }],
             },
             type_params: vec![],
@@ -74951,6 +74945,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(2420),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2165),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 11855, 11881),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2421),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2165),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1189),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 11855, 11881),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2422),
+            name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -74963,7 +74997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2421),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74977,7 +75011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2422),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74991,7 +75025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75005,7 +75039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75019,7 +75053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75033,7 +75067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75047,7 +75081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75061,7 +75095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75075,7 +75109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75089,7 +75123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75103,7 +75137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75117,7 +75151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75131,12 +75165,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -75150,12 +75184,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -75169,12 +75203,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -75188,7 +75222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75202,7 +75236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75216,7 +75250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75230,7 +75264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75244,7 +75278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75258,7 +75292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75272,7 +75306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75286,7 +75320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75300,7 +75334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75314,7 +75348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75328,7 +75362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75342,7 +75376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75356,7 +75390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75370,7 +75404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75384,7 +75418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75398,7 +75432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75412,7 +75446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75426,7 +75460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75440,7 +75474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75454,7 +75488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75468,7 +75502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75482,7 +75516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75496,7 +75530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75510,7 +75544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75524,7 +75558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75538,7 +75572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75552,7 +75586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75566,7 +75600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75580,7 +75614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75594,7 +75628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75608,7 +75642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75622,7 +75656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75636,7 +75670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75650,7 +75684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75664,7 +75698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75678,7 +75712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75692,7 +75726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75706,7 +75740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75720,7 +75754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75734,7 +75768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75748,7 +75782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75762,7 +75796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75776,7 +75810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75790,7 +75824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75804,7 +75838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75818,7 +75852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75832,7 +75866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75846,7 +75880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75860,7 +75894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75874,7 +75908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75888,7 +75922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75902,7 +75936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75916,7 +75950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75930,7 +75964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75944,7 +75978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75958,7 +75992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75972,7 +76006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75986,7 +76020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76000,7 +76034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76014,7 +76048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76028,7 +76062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76042,7 +76076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76056,7 +76090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76070,7 +76104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76084,7 +76118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76098,7 +76132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76112,7 +76146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76126,7 +76160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76140,7 +76174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76154,7 +76188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76168,13 +76202,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1141),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1143),
                 }],
             },
             type_params: vec![],
@@ -76188,13 +76222,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17652, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1230),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1232),
                 }],
             },
             type_params: vec![],
@@ -76208,13 +76242,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17877, 17892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1232),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1234),
                 }],
             },
             type_params: vec![],
@@ -76228,7 +76262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17897, 17917),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76242,7 +76276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76256,7 +76290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76270,7 +76304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76284,7 +76318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76298,7 +76332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76312,7 +76346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76326,7 +76360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76340,7 +76374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76354,7 +76388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76368,7 +76402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76382,12 +76416,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -76401,7 +76435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76415,7 +76449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76429,7 +76463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76443,7 +76477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4030, 4042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76457,7 +76491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4857, 4870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76471,7 +76505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4875, 4888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76485,7 +76519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4893, 4901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76499,12 +76533,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4926, 4934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1223),
+                    ty: DeclarationId(1225),
                 }],
             },
             type_params: vec![],
@@ -76518,12 +76552,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4939, 4979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -76537,17 +76571,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4984, 5017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "bind_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1224),
+                        ty: DeclarationId(1226),
                     },
                 ],
             },
@@ -76562,12 +76596,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5022, 5100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "declaration_name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -76581,17 +76615,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5266, 5329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "bind_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(782),
+                        ty: DeclarationId(784),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -76610,21 +76644,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5334, 5425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76639,17 +76673,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5430, 5562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76664,13 +76698,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5777, 5866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -76684,17 +76718,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6666, 6678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2535),
+                        ty: DeclarationId(2537),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -76713,13 +76747,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6615, 6712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -76733,17 +76767,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7412, 7424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2538),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2537),
+                        ty: DeclarationId(2539),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -76762,21 +76796,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7362, 7458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2539),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76791,21 +76825,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7756, 7878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2540),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76820,12 +76854,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 8140, 8265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2541),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1243),
+                    ty: DeclarationId(1245),
                 }],
             },
             type_params: vec![],
@@ -76839,21 +76873,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10318, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2542),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(1225),
+                        ty: DeclarationId(1227),
                     },
                     Field {
                         label: "baseline_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76868,17 +76902,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10733, 10865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2543),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76893,17 +76927,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11432, 11544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2544),
+            id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1226),
+                        ty: DeclarationId(1228),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76918,17 +76952,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12241, 12320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2545),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1214),
+                        ty: DeclarationId(1216),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -76947,21 +76981,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12540, 12653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2546),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1214),
+                        ty: DeclarationId(1216),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -76976,17 +77010,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12658, 12794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2547),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1212),
+                        ty: DeclarationId(1214),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1213),
+                        ty: DeclarationId(1215),
                     },
                 ],
             },
@@ -77001,17 +77035,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12799, 12881),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2548),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -77026,13 +77060,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12886, 12972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2549),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1212),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1214),
                 }],
             },
             type_params: vec![],
@@ -77046,17 +77080,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13051, 13061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2550),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2549),
+                        ty: DeclarationId(2551),
                     },
                 ],
             },
@@ -77071,21 +77105,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12977, 13067),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2551),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -77100,21 +77134,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14009, 14143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2552),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1243),
+                        ty: DeclarationId(1245),
                     },
                 ],
             },
@@ -77129,12 +77163,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14782, 14926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2553),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
-                    ty: DeclarationId(890),
+                    ty: DeclarationId(892),
                 }],
             },
             type_params: vec![],
@@ -77148,13 +77182,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15771, 15825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1141),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1143),
                 }],
             },
             type_params: vec![],
@@ -77168,13 +77202,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16869, 16892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2555),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1230),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1232),
                 }],
             },
             type_params: vec![],
@@ -77188,13 +77222,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16938, 16953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1141),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1143),
                 }],
             },
             type_params: vec![],
@@ -77208,13 +77242,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17209, 17232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(806),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(808),
                 }],
             },
             type_params: vec![],
@@ -77228,7 +77262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77242,7 +77276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77256,7 +77290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77270,11 +77304,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(785),
+                    DeclarationId(787),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -77289,7 +77323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77303,7 +77337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6338, 6356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77317,7 +77351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6361, 6376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77331,7 +77365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6405, 6426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77345,7 +77379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6431, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77359,7 +77393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8043, 8053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77373,7 +77407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8058, 8069),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77387,7 +77421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8074, 8087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77401,7 +77435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8092, 8105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77415,7 +77449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8110, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77429,7 +77463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8128, 8142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77443,7 +77477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8147, 8162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77457,7 +77491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8904, 8921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77471,7 +77505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8926, 8936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77485,37 +77519,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8941, 8945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1647),
+                        ty: DeclarationId(1649),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1649),
+                        ty: DeclarationId(1651),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "range_max_inclusive".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "is_copy".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1652),
                     },
                 ],
             },
@@ -77530,25 +77564,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9723, 10295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1648),
+                        ty: DeclarationId(1650),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1649),
+                        ty: DeclarationId(1651),
                     },
                     Field {
                         label: "is_copy".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -77563,13 +77597,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10300, 10482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1651),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1653),
                 }],
             },
             type_params: vec![],
@@ -77857,7 +77891,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(33),
             Port {
                 id: PortId(33),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(797))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(799))),
                 produced_by: None,
             },
         );
@@ -77897,7 +77931,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(38),
             Port {
                 id: PortId(38),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(702))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(704))),
                 produced_by: Some(NodeId(35)),
             },
         );
@@ -77905,7 +77939,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(39),
             Port {
                 id: PortId(39),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -77913,7 +77947,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(40),
             Port {
                 id: PortId(40),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -77921,7 +77955,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(41),
             Port {
                 id: PortId(41),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(702))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(704))),
                 produced_by: Some(NodeId(37)),
             },
         );
@@ -77929,7 +77963,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(42),
             Port {
                 id: PortId(42),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(702))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(704))),
                 produced_by: Some(NodeId(38)),
             },
         );
@@ -77937,7 +77971,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(43),
             Port {
                 id: PortId(43),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(39)),
             },
         );
@@ -77945,7 +77979,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(44),
             Port {
                 id: PortId(44),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -77961,7 +77995,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(46),
             Port {
                 id: PortId(46),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: Some(NodeId(42)),
             },
         );
@@ -77969,7 +78003,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(47),
             Port {
                 id: PortId(47),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -77977,7 +78011,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(48),
             Port {
                 id: PortId(48),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78001,7 +78035,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(51),
             Port {
                 id: PortId(51),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1877))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1879))),
                 produced_by: Some(NodeId(46)),
             },
         );
@@ -78009,7 +78043,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(52),
             Port {
                 id: PortId(52),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78017,7 +78051,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(53),
             Port {
                 id: PortId(53),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78025,7 +78059,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(54),
             Port {
                 id: PortId(54),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1878))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1880))),
                 produced_by: None,
             },
         );
@@ -78033,7 +78067,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(55),
             Port {
                 id: PortId(55),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1879))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1881))),
                 produced_by: Some(NodeId(48)),
             },
         );
@@ -78041,7 +78075,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(56),
             Port {
                 id: PortId(56),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78081,7 +78115,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(61),
             Port {
                 id: PortId(61),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(53)),
             },
         );
@@ -78089,7 +78123,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(62),
             Port {
                 id: PortId(62),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
                 produced_by: None,
             },
         );
@@ -78161,7 +78195,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(71),
             Port {
                 id: PortId(71),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78169,7 +78203,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(72),
             Port {
                 id: PortId(72),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78193,7 +78227,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(75),
             Port {
                 id: PortId(75),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(65)),
             },
         );
@@ -78201,7 +78235,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(76),
             Port {
                 id: PortId(76),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78209,7 +78243,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(77),
             Port {
                 id: PortId(77),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78233,7 +78267,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(80),
             Port {
                 id: PortId(80),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(69)),
             },
         );
@@ -78241,7 +78275,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(81),
             Port {
                 id: PortId(81),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78249,7 +78283,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(82),
             Port {
                 id: PortId(82),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78273,7 +78307,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(85),
             Port {
                 id: PortId(85),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(73)),
             },
         );
@@ -78281,7 +78315,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(86),
             Port {
                 id: PortId(86),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78289,7 +78323,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(87),
             Port {
                 id: PortId(87),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78313,7 +78347,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(90),
             Port {
                 id: PortId(90),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(77)),
             },
         );
@@ -78321,7 +78355,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(91),
             Port {
                 id: PortId(91),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1880))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1882))),
                 produced_by: None,
             },
         );
@@ -78345,7 +78379,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(94),
             Port {
                 id: PortId(94),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(81)),
             },
         );
@@ -78353,7 +78387,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(95),
             Port {
                 id: PortId(95),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -78361,7 +78395,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(96),
             Port {
                 id: PortId(96),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -79057,7 +79091,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(183),
             Port {
                 id: PortId(183),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(134)),
             },
         );
@@ -79065,7 +79099,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(184),
             Port {
                 id: PortId(184),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -79073,7 +79107,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(185),
             Port {
                 id: PortId(185),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -79081,7 +79115,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(186),
             Port {
                 id: PortId(186),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(136)),
             },
         );
@@ -79089,7 +79123,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(187),
             Port {
                 id: PortId(187),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -79097,7 +79131,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(188),
             Port {
                 id: PortId(188),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -79713,7 +79747,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(265),
             Port {
                 id: PortId(265),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(206)),
             },
         );
@@ -79721,7 +79755,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(266),
             Port {
                 id: PortId(266),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -79729,7 +79763,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(267),
             Port {
                 id: PortId(267),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -79745,7 +79779,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(269),
             Port {
                 id: PortId(269),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: Some(NodeId(209)),
             },
         );
@@ -79753,7 +79787,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(270),
             Port {
                 id: PortId(270),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -79761,7 +79795,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(271),
             Port {
                 id: PortId(271),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -79777,7 +79811,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(273),
             Port {
                 id: PortId(273),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: Some(NodeId(212)),
             },
         );
@@ -79785,7 +79819,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(274),
             Port {
                 id: PortId(274),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -79865,7 +79899,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(284),
             Port {
                 id: PortId(284),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(221)),
             },
         );
@@ -79873,7 +79907,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(285),
             Port {
                 id: PortId(285),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1881))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1883))),
                 produced_by: None,
             },
         );
@@ -79881,7 +79915,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(286),
             Port {
                 id: PortId(286),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(223)),
             },
         );
@@ -79889,7 +79923,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(287),
             Port {
                 id: PortId(287),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(224)),
             },
         );
@@ -79897,7 +79931,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(288),
             Port {
                 id: PortId(288),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1878))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1880))),
                 produced_by: Some(NodeId(225)),
             },
         );
@@ -79913,7 +79947,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(290),
             Port {
                 id: PortId(290),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1882))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1884))),
                 produced_by: Some(NodeId(227)),
             },
         );
@@ -79921,7 +79955,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(291),
             Port {
                 id: PortId(291),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1883))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1885))),
                 produced_by: None,
             },
         );
@@ -80025,7 +80059,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(304),
             Port {
                 id: PortId(304),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1884))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1886))),
                 produced_by: Some(NodeId(240)),
             },
         );
@@ -80033,7 +80067,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(305),
             Port {
                 id: PortId(305),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1885))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1887))),
                 produced_by: None,
             },
         );
@@ -80081,7 +80115,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(311),
             Port {
                 id: PortId(311),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1886))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1888))),
                 produced_by: Some(NodeId(247)),
             },
         );
@@ -80089,7 +80123,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(312),
             Port {
                 id: PortId(312),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1887))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1889))),
                 produced_by: None,
             },
         );
@@ -80161,7 +80195,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(321),
             Port {
                 id: PortId(321),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(256)),
             },
         );
@@ -80169,7 +80203,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(322),
             Port {
                 id: PortId(322),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1888))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1890))),
                 produced_by: None,
             },
         );
@@ -80273,7 +80307,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(335),
             Port {
                 id: PortId(335),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1889))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1891))),
                 produced_by: Some(NodeId(269)),
             },
         );
@@ -80281,7 +80315,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(336),
             Port {
                 id: PortId(336),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -80409,7 +80443,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(352),
             Port {
                 id: PortId(352),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(279)),
             },
         );
@@ -80417,7 +80451,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(353),
             Port {
                 id: PortId(353),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -80545,7 +80579,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(369),
             Port {
                 id: PortId(369),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(289)),
             },
         );
@@ -80553,7 +80587,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(370),
             Port {
                 id: PortId(370),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1890))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1892))),
                 produced_by: None,
             },
         );
@@ -80657,7 +80691,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(383),
             Port {
                 id: PortId(383),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(301)),
             },
         );
@@ -80665,7 +80699,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(384),
             Port {
                 id: PortId(384),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1891))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1893))),
                 produced_by: None,
             },
         );
@@ -80769,7 +80803,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(397),
             Port {
                 id: PortId(397),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(313)),
             },
         );
@@ -80777,7 +80811,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(398),
             Port {
                 id: PortId(398),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1892))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1894))),
                 produced_by: None,
             },
         );
@@ -80929,7 +80963,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(417),
             Port {
                 id: PortId(417),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(330)),
             },
         );
@@ -80937,7 +80971,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(418),
             Port {
                 id: PortId(418),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -80945,7 +80979,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(419),
             Port {
                 id: PortId(419),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81065,7 +81099,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(434),
             Port {
                 id: PortId(434),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(339)),
             },
         );
@@ -81073,7 +81107,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(435),
             Port {
                 id: PortId(435),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -81081,7 +81115,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(436),
             Port {
                 id: PortId(436),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81089,7 +81123,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(437),
             Port {
                 id: PortId(437),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81209,7 +81243,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(452),
             Port {
                 id: PortId(452),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(348)),
             },
         );
@@ -81217,7 +81251,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(453),
             Port {
                 id: PortId(453),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -81225,7 +81259,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(454),
             Port {
                 id: PortId(454),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -81233,7 +81267,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(455),
             Port {
                 id: PortId(455),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81241,7 +81275,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(456),
             Port {
                 id: PortId(456),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81273,7 +81307,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(353)),
             },
         );
@@ -81281,7 +81315,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(461),
             Port {
                 id: PortId(461),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81289,7 +81323,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(462),
             Port {
                 id: PortId(462),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81305,7 +81339,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(464),
             Port {
                 id: PortId(464),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(356)),
             },
         );
@@ -81313,7 +81347,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(465),
             Port {
                 id: PortId(465),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: None,
             },
         );
@@ -81321,7 +81355,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(466),
             Port {
                 id: PortId(466),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81329,7 +81363,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(467),
             Port {
                 id: PortId(467),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(358)),
             },
         );
@@ -81337,7 +81371,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(468),
             Port {
                 id: PortId(468),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(359)),
             },
         );
@@ -81361,7 +81395,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(471),
             Port {
                 id: PortId(471),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(362)),
             },
         );
@@ -81369,7 +81403,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(472),
             Port {
                 id: PortId(472),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -81377,7 +81411,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: None,
             },
         );
@@ -81385,7 +81419,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(474),
             Port {
                 id: PortId(474),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -81393,7 +81427,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(475),
             Port {
                 id: PortId(475),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1893))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1895))),
                 produced_by: None,
             },
         );
@@ -81401,7 +81435,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(476),
             Port {
                 id: PortId(476),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81505,7 +81539,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(489),
             Port {
                 id: PortId(489),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1894))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1896))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -81513,7 +81547,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(490),
             Port {
                 id: PortId(490),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1895))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1897))),
                 produced_by: None,
             },
         );
@@ -81521,7 +81555,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(491),
             Port {
                 id: PortId(491),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -81569,7 +81603,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(497),
             Port {
                 id: PortId(497),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1896))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1898))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -81577,7 +81611,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(498),
             Port {
                 id: PortId(498),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1897))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1899))),
                 produced_by: None,
             },
         );
@@ -81593,7 +81627,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(500),
             Port {
                 id: PortId(500),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1898))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1900))),
                 produced_by: Some(NodeId(388)),
             },
         );
@@ -81601,7 +81635,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(501),
             Port {
                 id: PortId(501),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1053))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1055))),
                 produced_by: None,
             },
         );
@@ -81761,7 +81795,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(521),
             Port {
                 id: PortId(521),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(405)),
             },
         );
@@ -81769,7 +81803,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1052))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1054))),
                 produced_by: None,
             },
         );
@@ -81849,7 +81883,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(532),
             Port {
                 id: PortId(532),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(414)),
             },
         );
@@ -81857,7 +81891,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(533),
             Port {
                 id: PortId(533),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2223))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2225))),
                 produced_by: None,
             },
         );
@@ -81865,7 +81899,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(534),
             Port {
                 id: PortId(534),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(416)),
             },
         );
@@ -81873,7 +81907,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(535),
             Port {
                 id: PortId(535),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(156))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(158))),
                 produced_by: Some(NodeId(418)),
             },
         );
@@ -81881,7 +81915,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: Some(NodeId(420)),
             },
         );
@@ -81889,7 +81923,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(537),
             Port {
                 id: PortId(537),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -81897,7 +81931,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(538),
             Port {
                 id: PortId(538),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -81905,7 +81939,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(539),
             Port {
                 id: PortId(539),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: None,
             },
         );
@@ -82185,7 +82219,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(574),
             Port {
                 id: PortId(574),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: Some(NodeId(452)),
             },
         );
@@ -82193,7 +82227,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(575),
             Port {
                 id: PortId(575),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -82201,7 +82235,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(576),
             Port {
                 id: PortId(576),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -82217,7 +82251,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(578),
             Port {
                 id: PortId(578),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: Some(NodeId(455)),
             },
         );
@@ -82233,7 +82267,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(580),
             Port {
                 id: PortId(580),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1186))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1188))),
                 produced_by: Some(NodeId(458)),
             },
         );
@@ -82249,7 +82283,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(582),
             Port {
                 id: PortId(582),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: Some(NodeId(461)),
             },
         );
@@ -82257,7 +82291,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(583),
             Port {
                 id: PortId(583),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -82265,7 +82299,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(584),
             Port {
                 id: PortId(584),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -82281,7 +82315,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(586),
             Port {
                 id: PortId(586),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: Some(NodeId(464)),
             },
         );
@@ -82289,7 +82323,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(587),
             Port {
                 id: PortId(587),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2402))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2404))),
                 produced_by: Some(NodeId(466)),
             },
         );
@@ -82297,7 +82331,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(588),
             Port {
                 id: PortId(588),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(808))),
                 produced_by: None,
             },
         );
@@ -82385,7 +82419,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(599),
             Port {
                 id: PortId(599),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(157))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: Some(NodeId(473)),
             },
         );
@@ -82393,7 +82427,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(600),
             Port {
                 id: PortId(600),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: None,
             },
         );
@@ -82401,7 +82435,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(601),
             Port {
                 id: PortId(601),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(157))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: None,
             },
         );
@@ -82433,7 +82467,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(605),
             Port {
                 id: PortId(605),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(950))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(952))),
                 produced_by: Some(NodeId(478)),
             },
         );
@@ -82465,7 +82499,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(609),
             Port {
                 id: PortId(609),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(157))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: Some(NodeId(483)),
             },
         );
@@ -82473,7 +82507,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(610),
             Port {
                 id: PortId(610),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -82481,7 +82515,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(611),
             Port {
                 id: PortId(611),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: None,
             },
         );
@@ -82497,7 +82531,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1867))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1869))),
                 produced_by: Some(NodeId(486)),
             },
         );
@@ -82617,7 +82651,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(954))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(956))),
                 produced_by: Some(NodeId(499)),
             },
         );
@@ -82625,7 +82659,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(629),
             Port {
                 id: PortId(629),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -82633,7 +82667,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(630),
             Port {
                 id: PortId(630),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(797))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(799))),
                 produced_by: None,
             },
         );
@@ -82721,7 +82755,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(641),
             Port {
                 id: PortId(641),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: Some(NodeId(508)),
             },
         );
@@ -82729,7 +82763,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(642),
             Port {
                 id: PortId(642),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -82737,7 +82771,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(643),
             Port {
                 id: PortId(643),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(808))),
                 produced_by: None,
             },
         );
@@ -83065,7 +83099,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(684),
             Port {
                 id: PortId(684),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2403))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2405))),
                 produced_by: Some(NodeId(545)),
             },
         );
@@ -83073,7 +83107,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(685),
             Port {
                 id: PortId(685),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -83081,7 +83115,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(686),
             Port {
                 id: PortId(686),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1187))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1189))),
                 produced_by: None,
             },
         );
@@ -83193,7 +83227,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(700),
             Port {
                 id: PortId(700),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(954))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(956))),
                 produced_by: Some(NodeId(559)),
             },
         );
@@ -83201,7 +83235,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(701),
             Port {
                 id: PortId(701),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -83209,7 +83243,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(702),
             Port {
                 id: PortId(702),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2557))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2559))),
                 produced_by: Some(NodeId(561)),
             },
         );
@@ -83217,7 +83251,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(703),
             Port {
                 id: PortId(703),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(785))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(787))),
                 produced_by: None,
             },
         );
@@ -83369,7 +83403,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(722),
             Port {
                 id: PortId(722),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: Some(NodeId(578)),
             },
         );
@@ -83377,7 +83411,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(723),
             Port {
                 id: PortId(723),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(785))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(787))),
                 produced_by: None,
             },
         );
@@ -83529,7 +83563,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(742),
             Port {
                 id: PortId(742),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: Some(NodeId(595)),
             },
         );
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 e01f8b16241..9a019b6ed53 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         ports: bootstrapped_fixture_without_parse_surface_dag_ports(),
         diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(),
         next_node_id: 597,
-        next_declaration_id: 2492,
+        next_declaration_id: 2494,
         next_port_id: 743,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2492,
+        declaration_append_begin_after_bootstrap: 2494,
     }
 }
 
@@ -375,14 +375,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(41),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(45),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10300, 10305),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(42),
-            target: TransformTarget::Callable(DeclarationId(829)),
+            target: TransformTarget::Callable(DeclarationId(831)),
             inputs: vec![PortId(45), PortId(44)],
             output: PortId(46),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10291, 10322),
@@ -398,21 +398,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(44),
-            target: TransformTarget::Callable(DeclarationId(1916)),
+            target: TransformTarget::Callable(DeclarationId(1918)),
             inputs: vec![PortId(47)],
             output: PortId(49),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(45),
-            target: TransformTarget::Callable(DeclarationId(1918)),
+            target: TransformTarget::Callable(DeclarationId(1920)),
             inputs: vec![PortId(49)],
             output: PortId(50),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(46),
-            target: TransformTarget::Callable(DeclarationId(1862)),
+            target: TransformTarget::Callable(DeclarationId(1864)),
             inputs: vec![PortId(47), PortId(48), PortId(50)],
             output: PortId(51),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -428,7 +428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(48),
-            target: TransformTarget::Callable(DeclarationId(1864)),
+            target: TransformTarget::Callable(DeclarationId(1866)),
             inputs: vec![PortId(52), PortId(53), PortId(54)],
             output: PortId(55),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -444,21 +444,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(50),
-            target: TransformTarget::Callable(DeclarationId(1919)),
+            target: TransformTarget::Callable(DeclarationId(1921)),
             inputs: vec![PortId(56)],
             output: PortId(57),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(51),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(58),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11826, 11831),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(52),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(60),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11847, 11852),
@@ -520,7 +520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(57),
-            target: TransformTarget::Callable(DeclarationId(836)),
+            target: TransformTarget::Callable(DeclarationId(838)),
             inputs: vec![PortId(65)],
             output: PortId(66),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11975, 12003),
@@ -589,21 +589,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(63),
-            target: TransformTarget::Callable(DeclarationId(833)),
+            target: TransformTarget::Callable(DeclarationId(835)),
             inputs: vec![PortId(71), PortId(72)],
             output: PortId(73),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12333, 12348),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(64),
-            target: TransformTarget::Callable(DeclarationId(1903)),
+            target: TransformTarget::Callable(DeclarationId(1905)),
             inputs: vec![PortId(73)],
             output: PortId(74),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(65),
-            target: TransformTarget::Callable(DeclarationId(849)),
+            target: TransformTarget::Callable(DeclarationId(851)),
             inputs: vec![PortId(74)],
             output: PortId(75),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12315, 12350),
@@ -619,21 +619,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(67),
-            target: TransformTarget::Callable(DeclarationId(833)),
+            target: TransformTarget::Callable(DeclarationId(835)),
             inputs: vec![PortId(76), PortId(77)],
             output: PortId(78),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12630, 12652),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(68),
-            target: TransformTarget::Callable(DeclarationId(1901)),
+            target: TransformTarget::Callable(DeclarationId(1903)),
             inputs: vec![PortId(78)],
             output: PortId(79),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(69),
-            target: TransformTarget::Callable(DeclarationId(849)),
+            target: TransformTarget::Callable(DeclarationId(851)),
             inputs: vec![PortId(79)],
             output: PortId(80),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12608, 12654),
@@ -649,14 +649,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(71),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(82), PortId(81)],
             output: PortId(83),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13598, 13623),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(72),
-            target: TransformTarget::Callable(DeclarationId(840)),
+            target: TransformTarget::Callable(DeclarationId(842)),
             inputs: vec![PortId(81), PortId(82)],
             output: PortId(84),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13654, 13681),
@@ -699,14 +699,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(75),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(86), PortId(87)],
             output: PortId(88),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13765, 13790),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(76),
-            target: TransformTarget::Callable(DeclarationId(837)),
+            target: TransformTarget::Callable(DeclarationId(839)),
             inputs: vec![PortId(86), PortId(87)],
             output: PortId(89),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13815, 13841),
@@ -756,14 +756,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(80),
-            target: TransformTarget::Callable(DeclarationId(1897)),
+            target: TransformTarget::Callable(DeclarationId(1899)),
             inputs: vec![PortId(92)],
             output: PortId(93),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(81),
-            target: TransformTarget::Callable(DeclarationId(1921)),
+            target: TransformTarget::Callable(DeclarationId(1923)),
             inputs: vec![PortId(91), PortId(93)],
             output: PortId(94),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -779,56 +779,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(83),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(98),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15204, 15208),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(84),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(101),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15275, 15279),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(85),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(103),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15306, 15311),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(86),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(105),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15337, 15342),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(87),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(107),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15372, 15377),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(88),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(109),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15404, 15409),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(89),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(111),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15432, 15437),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(90),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(113),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15460, 15465),
@@ -928,49 +928,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(92),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(117),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15539, 15543),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(93),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(119),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15566, 15570),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(94),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(115), PortId(120)],
             output: PortId(121),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15597, 15623),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(95),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(123),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15669, 15674),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(96),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(125),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15701, 15706),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(97),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(127),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15733, 15738),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(98),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(129),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15761, 15766),
@@ -1070,14 +1070,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(100),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(133),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15844, 15848),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(101),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(135),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15871, 15875),
@@ -1093,7 +1093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(103),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(137), PortId(136)],
             output: PortId(138),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15912, 15942),
@@ -1118,7 +1118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(106),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(140), PortId(141)],
             output: PortId(142),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15986, 16020),
@@ -1134,7 +1134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(108),
-            target: TransformTarget::Callable(DeclarationId(836)),
+            target: TransformTarget::Callable(DeclarationId(838)),
             inputs: vec![PortId(143)],
             output: PortId(144),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16038, 16059),
@@ -1150,7 +1150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(110),
-            target: TransformTarget::Callable(DeclarationId(836)),
+            target: TransformTarget::Callable(DeclarationId(838)),
             inputs: vec![PortId(145)],
             output: PortId(146),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16063, 16084),
@@ -1164,7 +1164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(112),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(148),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16112, 16117),
@@ -1198,21 +1198,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(114),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(151),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16144, 16149),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(115),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(153),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16176, 16181),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(116),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(155),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16204, 16209),
@@ -1312,49 +1312,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(118),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(159),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16280, 16284),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(119),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(157), PortId(160)],
             output: PortId(161),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16308, 16334),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(120),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(163),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16360, 16365),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(121),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(165),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16395, 16400),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(122),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(167),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16427, 16432),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(123),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(169),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16455, 16460),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(124),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(171),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16487, 16492),
@@ -1454,56 +1454,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(126),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(173)],
             output: PortId(174),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16927, 16945),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(127),
-            target: TransformTarget::Callable(DeclarationId(830)),
+            target: TransformTarget::Callable(DeclarationId(832)),
             inputs: vec![PortId(96)],
             output: PortId(175),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16957, 16978),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(128),
-            target: TransformTarget::Callable(DeclarationId(1923)),
+            target: TransformTarget::Callable(DeclarationId(1925)),
             inputs: vec![PortId(174), PortId(175)],
             output: PortId(176),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(129),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(868)),
             inputs: vec![PortId(176)],
             output: PortId(177),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16893, 17029),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(130),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(178)],
             output: PortId(179),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17092, 17110),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(131),
-            target: TransformTarget::Callable(DeclarationId(830)),
+            target: TransformTarget::Callable(DeclarationId(832)),
             inputs: vec![PortId(96)],
             output: PortId(180),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17122, 17143),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(132),
-            target: TransformTarget::Callable(DeclarationId(1925)),
+            target: TransformTarget::Callable(DeclarationId(1927)),
             inputs: vec![PortId(179), PortId(180)],
             output: PortId(181),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(133),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(868)),
             inputs: vec![PortId(181)],
             output: PortId(182),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17058, 17194),
@@ -1612,7 +1612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(136),
-            target: TransformTarget::Callable(DeclarationId(826)),
+            target: TransformTarget::Callable(DeclarationId(828)),
             inputs: vec![PortId(184), PortId(185)],
             output: PortId(186),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17268, 17290),
@@ -1628,63 +1628,63 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(138),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18426, 18430),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(139),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(190),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18495, 18500),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(140),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(191),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18529, 18533),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(141),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18564, 18568),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(142),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(194),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18595, 18599),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(143),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18629, 18633),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(144),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(196),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18657, 18661),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(145),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(197),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18682, 18686),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(146),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(198),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18712, 18716),
@@ -1784,14 +1784,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(149),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(202),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18804, 18809),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(150),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(203),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18838, 18843),
@@ -1807,14 +1807,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(152),
-            target: TransformTarget::Callable(DeclarationId(1156)),
+            target: TransformTarget::Callable(DeclarationId(1158)),
             inputs: vec![PortId(201)],
             output: PortId(206),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(153),
-            target: TransformTarget::Callable(DeclarationId(1156)),
+            target: TransformTarget::Callable(DeclarationId(1158)),
             inputs: vec![PortId(205)],
             output: PortId(207),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955),
@@ -1828,35 +1828,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(155),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(209),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18982, 18986),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(156),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(210),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19016, 19020),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(157),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(211),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19044, 19048),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(158),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19069, 19073),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(159),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(213),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19099, 19103),
@@ -1947,56 +1947,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(161),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(215),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19175, 19179),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(162),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(216),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19200, 19204),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(163),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19228, 19232),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(164),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(218),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19262, 19266),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(165),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(219),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19293, 19297),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(166),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(221),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19328, 19333),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(167),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(222),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19362, 19367),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(168),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(223),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19392, 19397),
@@ -2087,56 +2087,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(170),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(225),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19472, 19476),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(171),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(226),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19497, 19501),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(172),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(227),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19525, 19529),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(173),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(228),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19559, 19563),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(174),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(229),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19590, 19595),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(175),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19626, 19631),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(176),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19660, 19665),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(177),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(233),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19690, 19695),
@@ -2227,56 +2227,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(179),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(235),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19764, 19768),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(180),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(236),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19789, 19793),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(181),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(237),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19817, 19821),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(238),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19851, 19856),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(239),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19883, 19888),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(241),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19919, 19924),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(185),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(242),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19953, 19958),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(243),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19983, 19988),
@@ -2367,56 +2367,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(245),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20054, 20058),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(189),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(246),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20079, 20083),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(190),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(247),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20107, 20112),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(191),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(248),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20142, 20147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(192),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(249),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20174, 20179),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(193),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(251),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20210, 20215),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(194),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(252),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20244, 20249),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(195),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(253),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20274, 20279),
@@ -2507,56 +2507,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(197),
-            target: TransformTarget::Callable(DeclarationId(510)),
+            target: TransformTarget::Callable(DeclarationId(512)),
             inputs: vec![],
             output: PortId(255),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20350, 20354),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(198),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(256),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20375, 20380),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(199),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(257),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20404, 20409),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(200),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(258),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20439, 20444),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(201),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(259),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20471, 20476),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(261),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20507, 20512),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(203),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(262),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20541, 20546),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(204),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(263),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20571, 20576),
@@ -2740,7 +2740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(208),
-            target: TransformTarget::Callable(DeclarationId(845)),
+            target: TransformTarget::Callable(DeclarationId(847)),
             inputs: vec![PortId(266), PortId(267)],
             output: PortId(268),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20681, 20707),
@@ -2783,7 +2783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(211),
-            target: TransformTarget::Callable(DeclarationId(845)),
+            target: TransformTarget::Callable(DeclarationId(847)),
             inputs: vec![PortId(270), PortId(271)],
             output: PortId(272),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20814, 20840),
@@ -2826,49 +2826,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(214),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(275)],
             output: PortId(276),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22044, 22062),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(215),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(853)),
             inputs: vec![PortId(276)],
             output: PortId(277),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22025, 22063),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(216),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(859)),
             inputs: vec![PortId(277)],
             output: PortId(278),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22014, 22064),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(217),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(852)),
             inputs: vec![PortId(279)],
             output: PortId(280),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22168, 22186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(852)),
+            target: TransformTarget::Callable(DeclarationId(854)),
             inputs: vec![PortId(280)],
             output: PortId(281),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22136, 22187),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(856)),
             inputs: vec![PortId(281)],
             output: PortId(282),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22112, 22188),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(220),
-            target: TransformTarget::Callable(DeclarationId(859)),
+            target: TransformTarget::Callable(DeclarationId(861)),
             inputs: vec![PortId(282)],
             output: PortId(283),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22097, 22189),
@@ -2989,14 +2989,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(226),
-            target: TransformTarget::Callable(DeclarationId(1926)),
+            target: TransformTarget::Callable(DeclarationId(1928)),
             inputs: vec![PortId(287), PortId(288)],
             output: PortId(289),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(227),
-            target: TransformTarget::Callable(DeclarationId(1927)),
+            target: TransformTarget::Callable(DeclarationId(1929)),
             inputs: vec![PortId(286), PortId(289)],
             output: PortId(290),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -3012,7 +3012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(229),
-            target: TransformTarget::Callable(DeclarationId(1928)),
+            target: TransformTarget::Callable(DeclarationId(1930)),
             inputs: vec![],
             output: PortId(292),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -3028,7 +3028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(231),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(857)),
             inputs: vec![PortId(294)],
             output: PortId(295),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22641, 22671),
@@ -3044,7 +3044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(233),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(853)),
             inputs: vec![PortId(296)],
             output: PortId(297),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22685, 22717),
@@ -3069,14 +3069,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(236),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(853)),
             inputs: vec![PortId(299)],
             output: PortId(300),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22756, 22788),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(237),
-            target: TransformTarget::Callable(DeclarationId(1929)),
+            target: TransformTarget::Callable(DeclarationId(1931)),
             inputs: vec![PortId(298), PortId(300)],
             output: PortId(301),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -3158,7 +3158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(242),
-            target: TransformTarget::Callable(DeclarationId(853)),
+            target: TransformTarget::Callable(DeclarationId(855)),
             inputs: vec![PortId(305)],
             output: PortId(306),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23093, 23108),
@@ -3172,21 +3172,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(244),
-            target: TransformTarget::Callable(DeclarationId(1897)),
+            target: TransformTarget::Callable(DeclarationId(1899)),
             inputs: vec![PortId(307)],
             output: PortId(308),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(245),
-            target: TransformTarget::Callable(DeclarationId(1930)),
+            target: TransformTarget::Callable(DeclarationId(1932)),
             inputs: vec![],
             output: PortId(309),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(246),
-            target: TransformTarget::Callable(DeclarationId(1931)),
+            target: TransformTarget::Callable(DeclarationId(1933)),
             inputs: vec![PortId(308), PortId(309)],
             output: PortId(310),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -3229,7 +3229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(249),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(313),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23245, 23250),
@@ -3245,7 +3245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(251),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(857)),
             inputs: vec![PortId(315)],
             output: PortId(316),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23272, 23302),
@@ -3261,7 +3261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(253),
-            target: TransformTarget::Callable(DeclarationId(853)),
+            target: TransformTarget::Callable(DeclarationId(855)),
             inputs: vec![PortId(317)],
             output: PortId(318),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23306, 23328),
@@ -3323,7 +3323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(258),
-            target: TransformTarget::Callable(DeclarationId(1932)),
+            target: TransformTarget::Callable(DeclarationId(1934)),
             inputs: vec![],
             output: PortId(323),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -3339,7 +3339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(260),
-            target: TransformTarget::Callable(DeclarationId(856)),
+            target: TransformTarget::Callable(DeclarationId(858)),
             inputs: vec![PortId(325)],
             output: PortId(326),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23635, 23664),
@@ -3355,7 +3355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(262),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(856)),
             inputs: vec![PortId(327)],
             output: PortId(328),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23678, 23715),
@@ -3380,14 +3380,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(265),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(856)),
             inputs: vec![PortId(330)],
             output: PortId(331),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23754, 23791),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(1933)),
+            target: TransformTarget::Callable(DeclarationId(1935)),
             inputs: vec![PortId(329), PortId(331)],
             output: PortId(332),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -3483,42 +3483,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(273),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(341),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23908, 23913),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(274),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(343),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23939, 23944),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(275),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(345),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23967, 23972),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(276),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(347),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23991, 23996),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(277),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(349),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24015, 24020),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(278),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(351),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24043, 24048),
@@ -3641,42 +3641,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(283),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(358),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24163, 24168),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(284),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(360),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24194, 24199),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(285),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(362),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24222, 24227),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(286),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(364),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24246, 24251),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(287),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(366),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24270, 24275),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(288),
-            target: TransformTarget::Callable(DeclarationId(511)),
+            target: TransformTarget::Callable(DeclarationId(513)),
             inputs: vec![],
             output: PortId(368),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24298, 24303),
@@ -3792,7 +3792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(292),
-            target: TransformTarget::Callable(DeclarationId(1897)),
+            target: TransformTarget::Callable(DeclarationId(1899)),
             inputs: vec![PortId(371)],
             output: PortId(372),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -3835,21 +3835,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(297),
-            target: TransformTarget::Callable(DeclarationId(1934)),
+            target: TransformTarget::Callable(DeclarationId(1936)),
             inputs: vec![PortId(377), PortId(378)],
             output: PortId(379),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(298),
-            target: TransformTarget::Callable(DeclarationId(869)),
+            target: TransformTarget::Callable(DeclarationId(871)),
             inputs: vec![PortId(379)],
             output: PortId(380),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25302, 25350),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(299),
-            target: TransformTarget::Callable(DeclarationId(858)),
+            target: TransformTarget::Callable(DeclarationId(860)),
             inputs: vec![PortId(380)],
             output: PortId(381),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25293, 25351),
@@ -3932,7 +3932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(304),
-            target: TransformTarget::Callable(DeclarationId(1897)),
+            target: TransformTarget::Callable(DeclarationId(1899)),
             inputs: vec![PortId(385)],
             output: PortId(386),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -3984,14 +3984,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(310),
-            target: TransformTarget::Callable(DeclarationId(834)),
+            target: TransformTarget::Callable(DeclarationId(836)),
             inputs: vec![PortId(391), PortId(392), PortId(393)],
             output: PortId(394),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25577, 25627),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(311),
-            target: TransformTarget::Callable(DeclarationId(1903)),
+            target: TransformTarget::Callable(DeclarationId(1905)),
             inputs: vec![PortId(394)],
             output: PortId(395),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -4074,7 +4074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(316),
-            target: TransformTarget::Callable(DeclarationId(1897)),
+            target: TransformTarget::Callable(DeclarationId(1899)),
             inputs: vec![PortId(399)],
             output: PortId(400),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -4126,7 +4126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(322),
-            target: TransformTarget::Callable(DeclarationId(860)),
+            target: TransformTarget::Callable(DeclarationId(862)),
             inputs: vec![PortId(406), PortId(407)],
             output: PortId(408),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26086, 26135),
@@ -4160,14 +4160,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(326),
-            target: TransformTarget::Callable(DeclarationId(834)),
+            target: TransformTarget::Callable(DeclarationId(836)),
             inputs: vec![PortId(410), PortId(411), PortId(412)],
             output: PortId(413),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26171, 26221),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(327),
-            target: TransformTarget::Callable(DeclarationId(1901)),
+            target: TransformTarget::Callable(DeclarationId(1903)),
             inputs: vec![PortId(413)],
             output: PortId(414),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -4273,49 +4273,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(332),
-            target: TransformTarget::Callable(DeclarationId(861)),
+            target: TransformTarget::Callable(DeclarationId(863)),
             inputs: vec![PortId(420), PortId(418), PortId(419)],
             output: PortId(421),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26523, 26552),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(333),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(423),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26576, 26594),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(334),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(425),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26620, 26638),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(335),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26657, 26675),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(336),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(429),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26694, 26712),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(337),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(431),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26735, 26753),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(338),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(418), PortId(419)],
             output: PortId(433),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26776, 26794),
@@ -4424,49 +4424,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(341),
-            target: TransformTarget::Callable(DeclarationId(862)),
+            target: TransformTarget::Callable(DeclarationId(864)),
             inputs: vec![PortId(435), PortId(438), PortId(436), PortId(437)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26927, 26963),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(342),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(441),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26987, 27005),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(343),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(443),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27031, 27049),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(344),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(445),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27068, 27086),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(345),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27105, 27123),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(346),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(449),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27146, 27164),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(347),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(436), PortId(437)],
             output: PortId(451),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27187, 27205),
@@ -4575,21 +4575,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(350),
-            target: TransformTarget::Callable(DeclarationId(843)),
+            target: TransformTarget::Callable(DeclarationId(845)),
             inputs: vec![PortId(453), PortId(454)],
             output: PortId(457),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27340, 27366),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(351),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(865)),
             inputs: vec![PortId(453)],
             output: PortId(458),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27376, 27397),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(352),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(866)),
             inputs: vec![PortId(455), PortId(456)],
             output: PortId(459),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27409, 27427),
@@ -4632,14 +4632,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(355),
-            target: TransformTarget::Callable(DeclarationId(833)),
+            target: TransformTarget::Callable(DeclarationId(835)),
             inputs: vec![PortId(461), PortId(462)],
             output: PortId(463),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27617, 27632),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(356),
-            target: TransformTarget::Callable(DeclarationId(1901)),
+            target: TransformTarget::Callable(DeclarationId(1903)),
             inputs: vec![PortId(463)],
             output: PortId(464),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -4673,7 +4673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(360),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(466), PortId(468)],
             output: PortId(469),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27740, 27763),
@@ -4696,7 +4696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(363),
-            target: TransformTarget::Callable(DeclarationId(829)),
+            target: TransformTarget::Callable(DeclarationId(831)),
             inputs: vec![PortId(470), PortId(471)],
             output: PortId(472),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27720, 27784),
@@ -4730,7 +4730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(1935)),
+            target: TransformTarget::Callable(DeclarationId(1937)),
             inputs: vec![],
             output: PortId(477),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -4746,7 +4746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(369),
-            target: TransformTarget::Callable(DeclarationId(842)),
+            target: TransformTarget::Callable(DeclarationId(844)),
             inputs: vec![PortId(476), PortId(479)],
             output: PortId(480),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28026, 28057),
@@ -4762,7 +4762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(371),
-            target: TransformTarget::Callable(DeclarationId(867)),
+            target: TransformTarget::Callable(DeclarationId(869)),
             inputs: vec![PortId(481), PortId(476)],
             output: PortId(482),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28071, 28116),
@@ -4787,14 +4787,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(374),
-            target: TransformTarget::Callable(DeclarationId(867)),
+            target: TransformTarget::Callable(DeclarationId(869)),
             inputs: vec![PortId(484), PortId(476)],
             output: PortId(485),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28155, 28200),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(1936)),
+            target: TransformTarget::Callable(DeclarationId(1938)),
             inputs: vec![PortId(483), PortId(485)],
             output: PortId(486),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -4876,35 +4876,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(380),
-            target: TransformTarget::Callable(DeclarationId(830)),
+            target: TransformTarget::Callable(DeclarationId(832)),
             inputs: vec![PortId(491)],
             output: PortId(492),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28329, 28353),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(381),
-            target: TransformTarget::Callable(DeclarationId(1938)),
+            target: TransformTarget::Callable(DeclarationId(1940)),
             inputs: vec![PortId(490), PortId(492)],
             output: PortId(493),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(868)),
             inputs: vec![PortId(493)],
             output: PortId(494),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28310, 28378),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(867)),
+            target: TransformTarget::Callable(DeclarationId(869)),
             inputs: vec![PortId(490), PortId(491)],
             output: PortId(495),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28414, 28448),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(1939)),
+            target: TransformTarget::Callable(DeclarationId(1941)),
             inputs: vec![PortId(491), PortId(495)],
             output: PortId(496),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -4947,14 +4947,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(387),
-            target: TransformTarget::Callable(DeclarationId(1940)),
+            target: TransformTarget::Callable(DeclarationId(1942)),
             inputs: vec![],
             output: PortId(499),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(388),
-            target: TransformTarget::Callable(DeclarationId(1942)),
+            target: TransformTarget::Callable(DeclarationId(1944)),
             inputs: vec![PortId(498), PortId(499)],
             output: PortId(500),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -4977,7 +4977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(391),
-            target: TransformTarget::Callable(DeclarationId(1897)),
+            target: TransformTarget::Callable(DeclarationId(1899)),
             inputs: vec![PortId(502)],
             output: PortId(503),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -4993,7 +4993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(393),
-            target: TransformTarget::Callable(DeclarationId(1057)),
+            target: TransformTarget::Callable(DeclarationId(1059)),
             inputs: vec![PortId(505)],
             output: PortId(506),
             span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172),
@@ -5009,7 +5009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(395),
-            target: TransformTarget::Callable(DeclarationId(1058)),
+            target: TransformTarget::Callable(DeclarationId(1060)),
             inputs: vec![PortId(508)],
             output: PortId(509),
             span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238),
@@ -5025,7 +5025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(397),
-            target: TransformTarget::Callable(DeclarationId(1060)),
+            target: TransformTarget::Callable(DeclarationId(1062)),
             inputs: vec![PortId(511)],
             output: PortId(512),
             span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307),
@@ -5050,7 +5050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(400),
-            target: TransformTarget::Callable(DeclarationId(1905)),
+            target: TransformTarget::Callable(DeclarationId(1907)),
             inputs: vec![PortId(515)],
             output: PortId(516),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -5064,7 +5064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(402),
-            target: TransformTarget::Callable(DeclarationId(1905)),
+            target: TransformTarget::Callable(DeclarationId(1907)),
             inputs: vec![PortId(517)],
             output: PortId(518),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(1905)),
+            target: TransformTarget::Callable(DeclarationId(1907)),
             inputs: vec![PortId(519)],
             output: PortId(520),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -5205,7 +5205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(410),
-            target: TransformTarget::Callable(DeclarationId(1905)),
+            target: TransformTarget::Callable(DeclarationId(1907)),
             inputs: vec![PortId(526)],
             output: PortId(527),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -5230,7 +5230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(413),
-            target: TransformTarget::Callable(DeclarationId(1905)),
+            target: TransformTarget::Callable(DeclarationId(1907)),
             inputs: vec![PortId(530)],
             output: PortId(531),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -5279,7 +5279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(416),
-            target: TransformTarget::Callable(DeclarationId(1058)),
+            target: TransformTarget::Callable(DeclarationId(1060)),
             inputs: vec![PortId(533)],
             output: PortId(534),
             span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060),
@@ -5311,7 +5311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(420),
-            target: TransformTarget::Callable(DeclarationId(2318)),
+            target: TransformTarget::Callable(DeclarationId(2320)),
             inputs: vec![],
             output: PortId(536),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297),
@@ -5327,28 +5327,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(422),
-            target: TransformTarget::Callable(DeclarationId(2318)),
+            target: TransformTarget::Callable(DeclarationId(2320)),
             inputs: vec![],
             output: PortId(540),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(423),
-            target: TransformTarget::Callable(DeclarationId(2318)),
+            target: TransformTarget::Callable(DeclarationId(2320)),
             inputs: vec![],
             output: PortId(541),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(424),
-            target: TransformTarget::Callable(DeclarationId(2320)),
+            target: TransformTarget::Callable(DeclarationId(2322)),
             inputs: vec![],
             output: PortId(542),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(425),
-            target: TransformTarget::Callable(DeclarationId(2320)),
+            target: TransformTarget::Callable(DeclarationId(2322)),
             inputs: vec![],
             output: PortId(543),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727),
@@ -5364,7 +5364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(427),
-            target: TransformTarget::Callable(DeclarationId(2320)),
+            target: TransformTarget::Callable(DeclarationId(2322)),
             inputs: vec![],
             output: PortId(546),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769),
@@ -5419,21 +5419,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(429),
-            target: TransformTarget::Callable(DeclarationId(2318)),
+            target: TransformTarget::Callable(DeclarationId(2320)),
             inputs: vec![],
             output: PortId(548),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(2320)),
+            target: TransformTarget::Callable(DeclarationId(2322)),
             inputs: vec![],
             output: PortId(549),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(431),
-            target: TransformTarget::Callable(DeclarationId(2319)),
+            target: TransformTarget::Callable(DeclarationId(2321)),
             inputs: vec![],
             output: PortId(550),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897),
@@ -5449,7 +5449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(433),
-            target: TransformTarget::Callable(DeclarationId(2319)),
+            target: TransformTarget::Callable(DeclarationId(2321)),
             inputs: vec![],
             output: PortId(553),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943),
@@ -5513,21 +5513,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(436),
-            target: TransformTarget::Callable(DeclarationId(2318)),
+            target: TransformTarget::Callable(DeclarationId(2320)),
             inputs: vec![],
             output: PortId(557),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(437),
-            target: TransformTarget::Callable(DeclarationId(2320)),
+            target: TransformTarget::Callable(DeclarationId(2322)),
             inputs: vec![],
             output: PortId(558),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(438),
-            target: TransformTarget::Callable(DeclarationId(2319)),
+            target: TransformTarget::Callable(DeclarationId(2321)),
             inputs: vec![],
             output: PortId(559),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087),
@@ -5568,14 +5568,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(443),
-            target: TransformTarget::Callable(DeclarationId(1171)),
+            target: TransformTarget::Callable(DeclarationId(1173)),
             inputs: vec![PortId(564)],
             output: PortId(565),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7187, 7217),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(444),
-            target: TransformTarget::Callable(DeclarationId(2317)),
+            target: TransformTarget::Callable(DeclarationId(2319)),
             inputs: vec![PortId(565)],
             output: PortId(566),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219),
@@ -5634,7 +5634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(2317)),
+            target: TransformTarget::Callable(DeclarationId(2319)),
             inputs: vec![PortId(570)],
             output: PortId(571),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335),
@@ -5780,7 +5780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(455),
-            target: TransformTarget::Callable(DeclarationId(1178)),
+            target: TransformTarget::Callable(DeclarationId(1180)),
             inputs: vec![PortId(575), PortId(576), PortId(577)],
             output: PortId(578),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7515, 7558),
@@ -5803,7 +5803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(458),
-            target: TransformTarget::Callable(DeclarationId(1171)),
+            target: TransformTarget::Callable(DeclarationId(1173)),
             inputs: vec![PortId(579)],
             output: PortId(580),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7601, 7613),
@@ -5819,14 +5819,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(460),
-            target: TransformTarget::Callable(DeclarationId(1180)),
+            target: TransformTarget::Callable(DeclarationId(1182)),
             inputs: vec![],
             output: PortId(581),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7693, 7711),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(461),
-            target: TransformTarget::Callable(DeclarationId(2317)),
+            target: TransformTarget::Callable(DeclarationId(2319)),
             inputs: vec![PortId(581)],
             output: PortId(582),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713),
@@ -5849,7 +5849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(464),
-            target: TransformTarget::Callable(DeclarationId(1178)),
+            target: TransformTarget::Callable(DeclarationId(1180)),
             inputs: vec![PortId(583), PortId(584), PortId(585)],
             output: PortId(586),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7862, 7906),
@@ -5865,7 +5865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(466),
-            target: TransformTarget::Callable(DeclarationId(2322)),
+            target: TransformTarget::Callable(DeclarationId(2324)),
             inputs: vec![],
             output: PortId(587),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972),
@@ -6004,28 +6004,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(475),
-            target: TransformTarget::Callable(DeclarationId(2117)),
+            target: TransformTarget::Callable(DeclarationId(2119)),
             inputs: vec![],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(476),
-            target: TransformTarget::Callable(DeclarationId(2123)),
+            target: TransformTarget::Callable(DeclarationId(2125)),
             inputs: vec![PortId(602)],
             output: PortId(603),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(477),
-            target: TransformTarget::Callable(DeclarationId(1183)),
+            target: TransformTarget::Callable(DeclarationId(1185)),
             inputs: vec![],
             output: PortId(604),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8778, 8809),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(478),
-            target: TransformTarget::Callable(DeclarationId(950)),
+            target: TransformTarget::Callable(DeclarationId(952)),
             inputs: vec![PortId(603), PortId(601), PortId(600), PortId(604)],
             output: PortId(605),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8697, 8813),
@@ -6041,7 +6041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(480),
-            target: TransformTarget::Callable(DeclarationId(1170)),
+            target: TransformTarget::Callable(DeclarationId(1172)),
             inputs: vec![],
             output: PortId(606),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9153),
@@ -6062,7 +6062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(483),
-            target: TransformTarget::Callable(DeclarationId(157)),
+            target: TransformTarget::Callable(DeclarationId(159)),
             inputs: vec![PortId(606), PortId(607), PortId(608)],
             output: PortId(609),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9108, 9181),
@@ -6078,7 +6078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(485),
-            target: TransformTarget::Callable(DeclarationId(1221)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![PortId(610)],
             output: PortId(612),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9734, 9751),
@@ -6112,35 +6112,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(489),
-            target: TransformTarget::Callable(DeclarationId(1185)),
+            target: TransformTarget::Callable(DeclarationId(1187)),
             inputs: vec![PortId(611), PortId(616)],
             output: PortId(617),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9862, 9926),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(490),
-            target: TransformTarget::Callable(DeclarationId(2151)),
+            target: TransformTarget::Callable(DeclarationId(2153)),
             inputs: vec![PortId(617)],
             output: PortId(618),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(491),
-            target: TransformTarget::Callable(DeclarationId(1186)),
+            target: TransformTarget::Callable(DeclarationId(1188)),
             inputs: vec![],
             output: PortId(619),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10082, 10121),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(492),
-            target: TransformTarget::Callable(DeclarationId(1185)),
+            target: TransformTarget::Callable(DeclarationId(1187)),
             inputs: vec![PortId(611), PortId(619)],
             output: PortId(620),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10002, 10135),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(493),
-            target: TransformTarget::Callable(DeclarationId(2151)),
+            target: TransformTarget::Callable(DeclarationId(2153)),
             inputs: vec![PortId(620)],
             output: PortId(621),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147),
@@ -6186,21 +6186,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(496),
-            target: TransformTarget::Callable(DeclarationId(1184)),
+            target: TransformTarget::Callable(DeclarationId(1186)),
             inputs: vec![PortId(624)],
             output: PortId(625),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10287, 10326),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(497),
-            target: TransformTarget::Callable(DeclarationId(1185)),
+            target: TransformTarget::Callable(DeclarationId(1187)),
             inputs: vec![PortId(611), PortId(625)],
             output: PortId(626),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10215, 10336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(498),
-            target: TransformTarget::Callable(DeclarationId(2151)),
+            target: TransformTarget::Callable(DeclarationId(2153)),
             inputs: vec![PortId(626)],
             output: PortId(627),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344),
@@ -6255,14 +6255,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(502),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10862, 10893),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(503),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(636),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10916, 10947),
@@ -6302,21 +6302,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(2318)),
+            target: TransformTarget::Callable(DeclarationId(2320)),
             inputs: vec![],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(506),
-            target: TransformTarget::Callable(DeclarationId(2319)),
+            target: TransformTarget::Callable(DeclarationId(2321)),
             inputs: vec![],
             output: PortId(639),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(507),
-            target: TransformTarget::Callable(DeclarationId(2320)),
+            target: TransformTarget::Callable(DeclarationId(2322)),
             inputs: vec![],
             output: PortId(640),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030),
@@ -6380,42 +6380,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(510),
-            target: TransformTarget::Callable(DeclarationId(1221)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![PortId(642)],
             output: PortId(645),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11930, 11947),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(511),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(645)],
             output: PortId(646),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11921, 11948),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(512),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(647),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11963, 11994),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(2323)),
+            target: TransformTarget::Callable(DeclarationId(2325)),
             inputs: vec![PortId(647)],
             output: PortId(648),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(514),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(649),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12010, 12041),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(515),
-            target: TransformTarget::Callable(DeclarationId(2324)),
+            target: TransformTarget::Callable(DeclarationId(2326)),
             inputs: vec![PortId(649)],
             output: PortId(650),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042),
@@ -6449,42 +6449,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(517),
-            target: TransformTarget::Callable(DeclarationId(1221)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![PortId(642)],
             output: PortId(653),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12081, 12098),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(518),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12072, 12099),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(655),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12114, 12145),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(520),
-            target: TransformTarget::Callable(DeclarationId(2325)),
+            target: TransformTarget::Callable(DeclarationId(2327)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(521),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(657),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12161, 12192),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(2326)),
+            target: TransformTarget::Callable(DeclarationId(2328)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193),
@@ -6518,42 +6518,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(524),
-            target: TransformTarget::Callable(DeclarationId(1221)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![PortId(642)],
             output: PortId(661),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12229, 12246),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(661)],
             output: PortId(662),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12220, 12247),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(663),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12262, 12293),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(527),
-            target: TransformTarget::Callable(DeclarationId(2327)),
+            target: TransformTarget::Callable(DeclarationId(2329)),
             inputs: vec![PortId(663)],
             output: PortId(664),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(528),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12309, 12340),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(2328)),
+            target: TransformTarget::Callable(DeclarationId(2330)),
             inputs: vec![PortId(665)],
             output: PortId(666),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341),
@@ -6587,42 +6587,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(531),
-            target: TransformTarget::Callable(DeclarationId(1221)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![PortId(642)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12375, 12392),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(532),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(669)],
             output: PortId(670),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12366, 12393),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(533),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(671),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12408, 12439),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(534),
-            target: TransformTarget::Callable(DeclarationId(2329)),
+            target: TransformTarget::Callable(DeclarationId(2331)),
             inputs: vec![PortId(671)],
             output: PortId(672),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(535),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(673),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12455, 12486),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(536),
-            target: TransformTarget::Callable(DeclarationId(2330)),
+            target: TransformTarget::Callable(DeclarationId(2332)),
             inputs: vec![PortId(673)],
             output: PortId(674),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487),
@@ -6656,42 +6656,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(1221)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![PortId(642)],
             output: PortId(677),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12521, 12538),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(539),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(677)],
             output: PortId(678),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12512, 12539),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12585),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(541),
-            target: TransformTarget::Callable(DeclarationId(2331)),
+            target: TransformTarget::Callable(DeclarationId(2333)),
             inputs: vec![PortId(679)],
             output: PortId(680),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(1177)),
+            target: TransformTarget::Callable(DeclarationId(1179)),
             inputs: vec![],
             output: PortId(681),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12601, 12632),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(543),
-            target: TransformTarget::Callable(DeclarationId(2332)),
+            target: TransformTarget::Callable(DeclarationId(2334)),
             inputs: vec![PortId(681)],
             output: PortId(682),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633),
@@ -6812,28 +6812,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(1221)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![PortId(685)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12793, 12810),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(549),
-            target: TransformTarget::Callable(DeclarationId(691)),
+            target: TransformTarget::Callable(DeclarationId(693)),
             inputs: vec![PortId(689)],
             output: PortId(690),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12784, 12811),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(550),
-            target: TransformTarget::Callable(DeclarationId(2150)),
+            target: TransformTarget::Callable(DeclarationId(2152)),
             inputs: vec![],
             output: PortId(691),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(2150)),
+            target: TransformTarget::Callable(DeclarationId(2152)),
             inputs: vec![],
             output: PortId(692),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847),
@@ -6868,7 +6868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Value(ValueNode { id: NodeId(553), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(694), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12926, 13053), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(554),
-            target: TransformTarget::Callable(DeclarationId(1187)),
+            target: TransformTarget::Callable(DeclarationId(1189)),
             inputs: vec![PortId(685), PortId(694)],
             output: PortId(695),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12872, 13061),
@@ -6876,7 +6876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Value(ValueNode { id: NodeId(555), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(696), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13139, 13262), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(556),
-            target: TransformTarget::Callable(DeclarationId(1187)),
+            target: TransformTarget::Callable(DeclarationId(1189)),
             inputs: vec![PortId(685), PortId(696)],
             output: PortId(697),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13085, 13270),
@@ -6884,7 +6884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Value(ValueNode { id: NodeId(557), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(698), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13344, 13472), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(558),
-            target: TransformTarget::Callable(DeclarationId(1187)),
+            target: TransformTarget::Callable(DeclarationId(1189)),
             inputs: vec![PortId(685), PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13290, 13480),
@@ -7517,7 +7517,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(2492);
+        let mut declarations = Vec::with_capacity(2494);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -7525,11 +7525,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "True".to_string(),
-                        ty: DeclarationId(308),
+                        ty: DeclarationId(310),
                     },
                     Field {
                         label: "False".to_string(),
-                        ty: DeclarationId(309),
+                        ty: DeclarationId(311),
                     },
                 ],
             },
@@ -7620,7 +7620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bits".to_string(),
-                    ty: DeclarationId(310),
+                    ty: DeclarationId(312),
                 }],
             },
             type_params: vec![],
@@ -7639,7 +7639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bits".to_string(),
-                    ty: DeclarationId(311),
+                    ty: DeclarationId(313),
                 }],
             },
             type_params: vec![],
@@ -7658,7 +7658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(312),
+                    ty: DeclarationId(314),
                 }],
             },
             type_params: vec![],
@@ -7677,7 +7677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(313),
+                    ty: DeclarationId(315),
                 }],
             },
             type_params: vec![],
@@ -7696,7 +7696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(314),
+                    ty: DeclarationId(316),
                 }],
             },
             type_params: vec![],
@@ -7715,7 +7715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(315),
+                    ty: DeclarationId(317),
                 }],
             },
             type_params: vec![],
@@ -7735,11 +7735,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Ok".to_string(),
-                        ty: DeclarationId(316),
+                        ty: DeclarationId(318),
                     },
                     Field {
                         label: "Err".to_string(),
-                        ty: DeclarationId(317),
+                        ty: DeclarationId(319),
                     },
                 ],
             },
@@ -7788,11 +7788,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DivideByZero".to_string(),
-                        ty: DeclarationId(318),
+                        ty: DeclarationId(320),
                     },
                     Field {
                         label: "Overflow".to_string(),
-                        ty: DeclarationId(319),
+                        ty: DeclarationId(321),
                     },
                 ],
             },
@@ -7812,7 +7812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "op".to_string(),
-                    ty: DeclarationId(329),
+                    ty: DeclarationId(331),
                 }],
             },
             type_params: vec![DeclarationId(16)],
@@ -7845,7 +7845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "op".to_string(),
-                    ty: DeclarationId(330),
+                    ty: DeclarationId(332),
                 }],
             },
             type_params: vec![DeclarationId(18)],
@@ -7879,7 +7879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(331),
+                        ty: DeclarationId(333),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -7918,7 +7918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(332),
+                        ty: DeclarationId(334),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -7957,7 +7957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(333),
+                        ty: DeclarationId(335),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -7965,7 +7965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inverse".to_string(),
-                        ty: DeclarationId(334),
+                        ty: DeclarationId(336),
                     },
                 ],
             },
@@ -8000,7 +8000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(335),
+                        ty: DeclarationId(337),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -8008,7 +8008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inverse".to_string(),
-                        ty: DeclarationId(336),
+                        ty: DeclarationId(338),
                     },
                 ],
             },
@@ -8099,7 +8099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(337),
+                        ty: DeclarationId(339),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8107,7 +8107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(338),
+                        ty: DeclarationId(340),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8146,7 +8146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(339),
+                        ty: DeclarationId(341),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8154,7 +8154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(340),
+                        ty: DeclarationId(342),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8193,7 +8193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(341),
+                        ty: DeclarationId(343),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8201,11 +8201,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(342),
+                        ty: DeclarationId(344),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(343),
+                        ty: DeclarationId(345),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8244,11 +8244,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(344),
+                        ty: DeclarationId(346),
                     },
                     Field {
                         label: "sub".to_string(),
-                        ty: DeclarationId(345),
+                        ty: DeclarationId(347),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8256,15 +8256,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(346),
+                        ty: DeclarationId(348),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(347),
+                        ty: DeclarationId(349),
                     },
                     Field {
                         label: "div".to_string(),
-                        ty: DeclarationId(349),
+                        ty: DeclarationId(351),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8272,31 +8272,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "compare".to_string(),
-                        ty: DeclarationId(350),
+                        ty: DeclarationId(352),
                     },
                     Field {
                         label: "eq".to_string(),
-                        ty: DeclarationId(351),
+                        ty: DeclarationId(353),
                     },
                     Field {
                         label: "ne".to_string(),
-                        ty: DeclarationId(352),
+                        ty: DeclarationId(354),
                     },
                     Field {
                         label: "lt".to_string(),
-                        ty: DeclarationId(353),
+                        ty: DeclarationId(355),
                     },
                     Field {
                         label: "le".to_string(),
-                        ty: DeclarationId(354),
+                        ty: DeclarationId(356),
                     },
                     Field {
                         label: "gt".to_string(),
-                        ty: DeclarationId(355),
+                        ty: DeclarationId(357),
                     },
                     Field {
                         label: "ge".to_string(),
-                        ty: DeclarationId(356),
+                        ty: DeclarationId(358),
                     },
                 ],
             },
@@ -8331,7 +8331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(357),
+                        ty: DeclarationId(359),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -8339,11 +8339,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(358),
+                        ty: DeclarationId(360),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(359),
+                        ty: DeclarationId(361),
                     },
                     Field {
                         label: "one".to_string(),
@@ -8351,11 +8351,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "reciprocal".to_string(),
-                        ty: DeclarationId(360),
+                        ty: DeclarationId(362),
                     },
                     Field {
                         label: "compare".to_string(),
-                        ty: DeclarationId(361),
+                        ty: DeclarationId(363),
                     },
                 ],
             },
@@ -8390,11 +8390,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(362),
+                        ty: DeclarationId(364),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(363),
+                        ty: DeclarationId(365),
                     },
                 ],
             },
@@ -8429,11 +8429,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(364),
+                        ty: DeclarationId(366),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(365),
+                        ty: DeclarationId(367),
                     },
                     Field {
                         label: "top".to_string(),
@@ -8476,15 +8476,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(366),
+                        ty: DeclarationId(368),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(367),
+                        ty: DeclarationId(369),
                     },
                     Field {
                         label: "complement".to_string(),
-                        ty: DeclarationId(368),
+                        ty: DeclarationId(370),
                     },
                     Field {
                         label: "top".to_string(),
@@ -8527,87 +8527,87 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "concat".to_string(),
-                        ty: DeclarationId(372),
+                        ty: DeclarationId(374),
                     },
                     Field {
                         label: "empty".to_string(),
-                        ty: DeclarationId(373),
+                        ty: DeclarationId(375),
                     },
                     Field {
                         label: "append".to_string(),
-                        ty: DeclarationId(375),
+                        ty: DeclarationId(377),
                     },
                     Field {
                         label: "slice".to_string(),
-                        ty: DeclarationId(377),
+                        ty: DeclarationId(379),
                     },
                     Field {
                         label: "length".to_string(),
-                        ty: DeclarationId(378),
+                        ty: DeclarationId(380),
                     },
                     Field {
                         label: "is_empty".to_string(),
-                        ty: DeclarationId(379),
+                        ty: DeclarationId(381),
                     },
                     Field {
                         label: "count".to_string(),
-                        ty: DeclarationId(380),
+                        ty: DeclarationId(382),
                     },
                     Field {
                         label: "first".to_string(),
-                        ty: DeclarationId(382),
+                        ty: DeclarationId(384),
                     },
                     Field {
                         label: "last".to_string(),
-                        ty: DeclarationId(384),
+                        ty: DeclarationId(386),
                     },
                     Field {
                         label: "map".to_string(),
-                        ty: DeclarationId(387),
+                        ty: DeclarationId(389),
                     },
                     Field {
                         label: "filter".to_string(),
-                        ty: DeclarationId(390),
+                        ty: DeclarationId(392),
                     },
                     Field {
                         label: "fold".to_string(),
-                        ty: DeclarationId(392),
+                        ty: DeclarationId(394),
                     },
                     Field {
                         label: "flat_map".to_string(),
-                        ty: DeclarationId(396),
+                        ty: DeclarationId(398),
                     },
                     Field {
                         label: "any".to_string(),
-                        ty: DeclarationId(398),
+                        ty: DeclarationId(400),
                     },
                     Field {
                         label: "all".to_string(),
-                        ty: DeclarationId(400),
+                        ty: DeclarationId(402),
                     },
                     Field {
                         label: "enumerate".to_string(),
-                        ty: DeclarationId(404),
+                        ty: DeclarationId(406),
                     },
                     Field {
                         label: "reverse".to_string(),
-                        ty: DeclarationId(406),
+                        ty: DeclarationId(408),
                     },
                     Field {
                         label: "skip".to_string(),
-                        ty: DeclarationId(408),
+                        ty: DeclarationId(410),
                     },
                     Field {
                         label: "take".to_string(),
-                        ty: DeclarationId(410),
+                        ty: DeclarationId(412),
                     },
                     Field {
                         label: "sort_by".to_string(),
-                        ty: DeclarationId(413),
+                        ty: DeclarationId(415),
                     },
                     Field {
                         label: "contains".to_string(),
-                        ty: DeclarationId(414),
+                        ty: DeclarationId(416),
                     },
                 ],
             },
@@ -8642,43 +8642,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lookup".to_string(),
-                        ty: DeclarationId(416),
+                        ty: DeclarationId(418),
                     },
                     Field {
                         label: "empty".to_string(),
-                        ty: DeclarationId(417),
+                        ty: DeclarationId(419),
                     },
                     Field {
                         label: "get".to_string(),
-                        ty: DeclarationId(419),
+                        ty: DeclarationId(421),
                     },
                     Field {
                         label: "insert".to_string(),
-                        ty: DeclarationId(421),
+                        ty: DeclarationId(423),
                     },
                     Field {
                         label: "merge".to_string(),
-                        ty: DeclarationId(424),
+                        ty: DeclarationId(426),
                     },
                     Field {
                         label: "keys".to_string(),
-                        ty: DeclarationId(426),
+                        ty: DeclarationId(428),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(428),
+                        ty: DeclarationId(430),
                     },
                     Field {
                         label: "has".to_string(),
-                        ty: DeclarationId(429),
+                        ty: DeclarationId(431),
                     },
                     Field {
                         label: "contains_key".to_string(),
-                        ty: DeclarationId(430),
+                        ty: DeclarationId(432),
                     },
                     Field {
                         label: "size".to_string(),
-                        ty: DeclarationId(431),
+                        ty: DeclarationId(433),
                     },
                 ],
             },
@@ -8727,15 +8727,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Less".to_string(),
-                        ty: DeclarationId(432),
+                        ty: DeclarationId(434),
                     },
                     Field {
                         label: "Equal".to_string(),
-                        ty: DeclarationId(433),
+                        ty: DeclarationId(435),
                     },
                     Field {
                         label: "Greater".to_string(),
-                        ty: DeclarationId(434),
+                        ty: DeclarationId(436),
                     },
                 ],
             },
@@ -8756,31 +8756,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OrderedRingProfile".to_string(),
-                        ty: DeclarationId(435),
+                        ty: DeclarationId(437),
                     },
                     Field {
                         label: "ApproximateFieldProfile".to_string(),
-                        ty: DeclarationId(436),
+                        ty: DeclarationId(438),
                     },
                     Field {
                         label: "BooleanAlgebraProfile".to_string(),
-                        ty: DeclarationId(437),
+                        ty: DeclarationId(439),
                     },
                     Field {
                         label: "BooleanAlgebraCollectionProfile".to_string(),
-                        ty: DeclarationId(438),
+                        ty: DeclarationId(440),
                     },
                     Field {
                         label: "FreeMonoidScalarProfile".to_string(),
-                        ty: DeclarationId(439),
+                        ty: DeclarationId(441),
                     },
                     Field {
                         label: "FreeMonoidCollectionProfile".to_string(),
-                        ty: DeclarationId(440),
+                        ty: DeclarationId(442),
                     },
                     Field {
                         label: "PartialFunctionProfile".to_string(),
-                        ty: DeclarationId(441),
+                        ty: DeclarationId(443),
                     },
                 ],
             },
@@ -8801,11 +8801,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SameAsReceiver".to_string(),
-                        ty: DeclarationId(442),
+                        ty: DeclarationId(444),
                     },
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(443),
+                        ty: DeclarationId(445),
                     },
                 ],
             },
@@ -8826,43 +8826,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReceiverSelf".to_string(),
-                        ty: DeclarationId(444),
+                        ty: DeclarationId(446),
                     },
                     Field {
                         label: "ReceiverElement".to_string(),
-                        ty: DeclarationId(445),
+                        ty: DeclarationId(447),
                     },
                     Field {
                         label: "ReceiverKey".to_string(),
-                        ty: DeclarationId(446),
+                        ty: DeclarationId(448),
                     },
                     Field {
                         label: "ReceiverValue".to_string(),
-                        ty: DeclarationId(447),
+                        ty: DeclarationId(449),
                     },
                     Field {
                         label: "NamedTemplate".to_string(),
-                        ty: DeclarationId(448),
+                        ty: DeclarationId(450),
                     },
                     Field {
                         label: "ContainerOf".to_string(),
-                        ty: DeclarationId(449),
+                        ty: DeclarationId(451),
                     },
                     Field {
                         label: "OptionalOf".to_string(),
-                        ty: DeclarationId(450),
+                        ty: DeclarationId(452),
                     },
                     Field {
                         label: "TupleOf".to_string(),
-                        ty: DeclarationId(451),
+                        ty: DeclarationId(453),
                     },
                     Field {
                         label: "CallableOf".to_string(),
-                        ty: DeclarationId(453),
+                        ty: DeclarationId(455),
                     },
                     Field {
                         label: "AlgebraTypeVariable".to_string(),
-                        ty: DeclarationId(454),
+                        ty: DeclarationId(456),
                     },
                 ],
             },
@@ -8883,15 +8883,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(455),
+                        ty: DeclarationId(457),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(456),
+                        ty: DeclarationId(458),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(457),
+                        ty: DeclarationId(459),
                     },
                 ],
             },
@@ -8912,19 +8912,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(458),
+                        ty: DeclarationId(460),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(459),
+                        ty: DeclarationId(461),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(460),
+                        ty: DeclarationId(462),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(461),
+                        ty: DeclarationId(463),
                     },
                 ],
             },
@@ -8945,11 +8945,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "param_types".to_string(),
-                        ty: DeclarationId(462),
+                        ty: DeclarationId(464),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -8957,15 +8957,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(463),
+                        ty: DeclarationId(465),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(464),
+                        ty: DeclarationId(466),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(465),
+                        ty: DeclarationId(467),
                     },
                 ],
             },
@@ -8983,21 +8983,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(59),
             name: Some("kernel_algebra_profile".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(53),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(466)),
+            meta_tag: Some(DeclarationId(468)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -9005,49 +9005,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "Int".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(435),
+                            constructor: DeclarationId(437),
                             payload: vec![],
                         },
                     ),
                     (
                         "Float".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(436),
+                            constructor: DeclarationId(438),
                             payload: vec![],
                         },
                     ),
                     (
                         "Bool".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(437),
+                            constructor: DeclarationId(439),
                             payload: vec![],
                         },
                     ),
                     (
                         "String".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(439),
+                            constructor: DeclarationId(441),
                             payload: vec![],
                         },
                     ),
                     (
                         "List".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(440),
+                            constructor: DeclarationId(442),
                             payload: vec![],
                         },
                     ),
                     (
                         "Set".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(438),
+                            constructor: DeclarationId(440),
                             payload: vec![],
                         },
                     ),
                     (
                         "Map".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(441),
+                            constructor: DeclarationId(443),
                             payload: vec![],
                         },
                     ),
@@ -9063,7 +9063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ordered_ring_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(320),
+                output: DeclarationId(322),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 24213, 25355)),
             },
             type_params: vec![],
@@ -9081,7 +9081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("approximate_field_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(321),
+                output: DeclarationId(323),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 25420, 26514)),
             },
             type_params: vec![],
@@ -9099,7 +9099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("boolean_algebra_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(322),
+                output: DeclarationId(324),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 26577, 27338)),
             },
             type_params: vec![],
@@ -9117,7 +9117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("boolean_algebra_collection_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(323),
+                output: DeclarationId(325),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 27703, 31048)),
             },
             type_params: vec![],
@@ -9135,7 +9135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("free_monoid_scalar_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(324),
+                output: DeclarationId(326),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 31114, 34351)),
             },
             type_params: vec![],
@@ -9153,7 +9153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("free_monoid_collection_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(325),
+                output: DeclarationId(327),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 34421, 39686)),
             },
             type_params: vec![],
@@ -9171,7 +9171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("partial_function_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(326),
+                output: DeclarationId(328),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 39750, 42574)),
             },
             type_params: vec![],
@@ -9189,7 +9189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("algebra_templates_for_profile".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(327),
+                output: DeclarationId(329),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 42664, 43127)),
             },
             type_params: vec![],
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("algebra_type_param_names".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(328),
+                output: DeclarationId(330),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 43469, 43750)),
             },
             type_params: vec![],
@@ -9282,7 +9282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Phantom".to_string(),
-                    ty: DeclarationId(467),
+                    ty: DeclarationId(469),
                 }],
             },
             type_params: vec![DeclarationId(74), DeclarationId(75)],
@@ -9357,7 +9357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(468),
+                        value: DeclarationId(470),
                     },
                 ],
             },
@@ -9383,7 +9383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(469),
+                        value: DeclarationId(471),
                     },
                 ],
             },
@@ -9409,7 +9409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(470),
+                        value: DeclarationId(472),
                     },
                 ],
             },
@@ -9435,7 +9435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(471),
+                        value: DeclarationId(473),
                     },
                 ],
             },
@@ -9461,7 +9461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(472),
+                        value: DeclarationId(474),
                     },
                 ],
             },
@@ -9487,7 +9487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(473),
+                        value: DeclarationId(475),
                     },
                 ],
             },
@@ -9513,7 +9513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(474),
+                        value: DeclarationId(476),
                     },
                 ],
             },
@@ -9539,7 +9539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(475),
+                        value: DeclarationId(477),
                     },
                 ],
             },
@@ -9565,7 +9565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(476),
+                        value: DeclarationId(478),
                     },
                 ],
             },
@@ -9591,7 +9591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(477),
+                        value: DeclarationId(479),
                     },
                 ],
             },
@@ -9714,7 +9714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(478),
+                    value: DeclarationId(480),
                 }],
             },
             type_params: vec![],
@@ -9756,7 +9756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(479),
+                        value: DeclarationId(481),
                     },
                 ],
             },
@@ -9782,7 +9782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(480),
+                        value: DeclarationId(482),
                     },
                 ],
             },
@@ -9823,7 +9823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(481)),
+            refinement: Some(DeclarationId(483)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/integer.dag", 9519, 9558),
         });
@@ -9834,7 +9834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 template: DeclarationId(39),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(40),
-                    value: DeclarationId(482),
+                    value: DeclarationId(484),
                 }],
             },
             type_params: vec![],
@@ -9854,23 +9854,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToNearestEven".to_string(),
-                        ty: DeclarationId(483),
+                        ty: DeclarationId(485),
                     },
                     Field {
                         label: "ToZero".to_string(),
-                        ty: DeclarationId(484),
+                        ty: DeclarationId(486),
                     },
                     Field {
                         label: "ToPositiveInfinity".to_string(),
-                        ty: DeclarationId(485),
+                        ty: DeclarationId(487),
                     },
                     Field {
                         label: "ToNegativeInfinity".to_string(),
-                        ty: DeclarationId(486),
+                        ty: DeclarationId(488),
                     },
                     Field {
                         label: "ToAwayFromZero".to_string(),
-                        ty: DeclarationId(487),
+                        ty: DeclarationId(489),
                     },
                 ],
             },
@@ -9891,15 +9891,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(488),
+                        ty: DeclarationId(490),
                     },
                     Field {
                         label: "BinaryPrecision".to_string(),
-                        ty: DeclarationId(489),
+                        ty: DeclarationId(491),
                     },
                     Field {
                         label: "DecimalPrecision".to_string(),
-                        ty: DeclarationId(490),
+                        ty: DeclarationId(492),
                     },
                 ],
             },
@@ -9920,15 +9920,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoNaN".to_string(),
-                        ty: DeclarationId(491),
+                        ty: DeclarationId(493),
                     },
                     Field {
                         label: "QuietNaN".to_string(),
-                        ty: DeclarationId(492),
+                        ty: DeclarationId(494),
                     },
                     Field {
                         label: "QuietAndSignalingNaN".to_string(),
-                        ty: DeclarationId(493),
+                        ty: DeclarationId(495),
                     },
                 ],
             },
@@ -9949,11 +9949,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoInfinity".to_string(),
-                        ty: DeclarationId(494),
+                        ty: DeclarationId(496),
                     },
                     Field {
                         label: "SignedInfinity".to_string(),
-                        ty: DeclarationId(495),
+                        ty: DeclarationId(497),
                     },
                 ],
             },
@@ -9974,11 +9974,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSignedZero".to_string(),
-                        ty: DeclarationId(496),
+                        ty: DeclarationId(498),
                     },
                     Field {
                         label: "SignedZero".to_string(),
-                        ty: DeclarationId(497),
+                        ty: DeclarationId(499),
                     },
                 ],
             },
@@ -9999,15 +9999,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSubnormals".to_string(),
-                        ty: DeclarationId(498),
+                        ty: DeclarationId(500),
                     },
                     Field {
                         label: "GradualUnderflow".to_string(),
-                        ty: DeclarationId(499),
+                        ty: DeclarationId(501),
                     },
                     Field {
                         label: "FlushToZero".to_string(),
-                        ty: DeclarationId(500),
+                        ty: DeclarationId(502),
                     },
                 ],
             },
@@ -10057,7 +10057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(501),
+                        ty: DeclarationId(503),
                     },
                     Field {
                         label: "rounding".to_string(),
@@ -10113,21 +10113,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1216, 1233),
+            span: SourceSpan::new("dsl/std/float.dag", 1248, 1265),
         });
         declarations.push(Declaration {
             id: DeclarationId(110),
-            name: Some("Float32".to_string()),
+            name: Some("Real".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(107),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(108),
+                    value: DeclarationId(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("dsl/std/float.dag", 1446, 1497),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(111),
+            name: Some("Real32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(73),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(74),
-                        value: DeclarationId(109),
+                        value: DeclarationId(110),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(502),
+                        value: DeclarationId(505),
                     },
                 ],
             },
@@ -10139,21 +10159,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1235, 1293),
+            span: SourceSpan::new("dsl/std/float.dag", 1719, 1768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(111),
-            name: Some("Float64".to_string()),
+            id: DeclarationId(112),
+            name: Some("Real64".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(73),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(74),
-                        value: DeclarationId(109),
+                        value: DeclarationId(110),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(503),
+                        value: DeclarationId(506),
                     },
                 ],
             },
@@ -10165,11 +10185,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1294, 1352),
+            span: SourceSpan::new("dsl/std/float.dag", 1769, 1818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(112),
-            name: Some("Float".to_string()),
+            id: DeclarationId(113),
+            name: Some("Float32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(111),
                 arguments: vec![],
@@ -10182,17 +10202,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1371, 1391),
+            span: SourceSpan::new("dsl/std/float.dag", 1820, 1841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(113),
-            name: Some("Real".to_string()),
+            id: DeclarationId(114),
+            name: Some("Float64".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(107),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(108),
-                    value: DeclarationId(504),
-                }],
+                template: DeclarationId(112),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -10202,27 +10219,44 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1572, 1623),
+            span: SourceSpan::new("dsl/std/float.dag", 1842, 1863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(114),
+            id: DeclarationId(115),
+            name: Some("Float".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(114),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("dsl/std/float.dag", 1882, 1902),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(116),
             name: Some("kernel_type_set".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(618)),
+            meta_tag: Some(DeclarationId(620)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10267,11 +10301,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3041, 3206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(115),
+            id: DeclarationId(117),
             name: Some("is_kernel_type".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3248, 3344)),
             },
             type_params: vec![],
@@ -10285,24 +10319,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3208, 3344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(116),
+            id: DeclarationId(118),
             name: Some("container_type_arity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(93),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(619)),
+            meta_tag: Some(DeclarationId(621)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10327,11 +10361,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3506, 3587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(117),
+            id: DeclarationId(119),
             name: Some("is_container_type".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3632, 3734)),
             },
             type_params: vec![],
@@ -10345,11 +10379,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3589, 3734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(118),
+            id: DeclarationId(120),
             name: Some("container_expected_arity".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(505),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(507),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3786, 3827)),
             },
             type_params: vec![],
@@ -10363,11 +10397,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3736, 3827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(119),
+            id: DeclarationId(121),
             name: Some("container_param_names_for".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(506),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(508),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4067, 4204)),
             },
             type_params: vec![],
@@ -10381,11 +10415,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4003, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(120),
+            id: DeclarationId(122),
             name: Some("container_param_name".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(507),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(509),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4272, 4512)),
             },
             type_params: vec![],
@@ -10399,24 +10433,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4206, 4512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(121),
+            id: DeclarationId(123),
             name: Some("ordered_element_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(620)),
+            meta_tag: Some(DeclarationId(622)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10431,11 +10465,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4706, 4778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(122),
+            id: DeclarationId(124),
             name: Some("is_ordered_element_collection".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4835, 4892)),
             },
             type_params: vec![],
@@ -10449,24 +10483,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4780, 4892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(123),
+            id: DeclarationId(125),
             name: Some("container_template_algebra_rows".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(621)),
+            meta_tag: Some(DeclarationId(623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -10527,11 +10561,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 5684, 6123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(124),
+            id: DeclarationId(126),
             name: Some("container_template_algebra".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(508),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(510),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 6180, 6232)),
             },
             type_params: vec![],
@@ -10545,11 +10579,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6125, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(125),
+            id: DeclarationId(127),
             name: Some("canonical_container_names".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(509),
+                output: DeclarationId(511),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 6521, 6600)),
             },
             type_params: vec![],
@@ -10563,17 +10597,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6474, 6600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(126),
+            id: DeclarationId(128),
             name: Some("Bool".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "True".to_string(),
-                        ty: DeclarationId(510),
+                        ty: DeclarationId(512),
                     },
                     Field {
                         label: "False".to_string(),
-                        ty: DeclarationId(511),
+                        ty: DeclarationId(513),
                     },
                 ],
             },
@@ -10581,14 +10615,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(664)),
+            inhabits: Some(DeclarationId(666)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 7574, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(127),
+            id: DeclarationId(129),
             name: Some("Unit".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10602,7 +10636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 7666, 7675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(128),
+            id: DeclarationId(130),
             name: Some("Json".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10616,7 +10650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 7792, 7801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(129),
+            id: DeclarationId(131),
             name: Some("Bytes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10630,7 +10664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 7802, 7812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(130),
+            id: DeclarationId(132),
             name: Some("Char".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -10647,16 +10681,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 8503, 8518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(131),
+            id: DeclarationId(133),
             name: Some("List".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(132),
+                    value: DeclarationId(134),
                 }],
             },
-            type_params: vec![DeclarationId(132)],
+            type_params: vec![DeclarationId(134)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -10667,7 +10701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 9282, 9322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(132),
+            id: DeclarationId(134),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -10681,16 +10715,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 9282, 9322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(133),
+            id: DeclarationId(135),
             name: Some("Set".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(45),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(46),
-                    value: DeclarationId(134),
+                    value: DeclarationId(136),
                 }],
             },
-            type_params: vec![DeclarationId(134)],
+            type_params: vec![DeclarationId(136)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -10701,7 +10735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 9323, 9366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(134),
+            id: DeclarationId(136),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -10715,22 +10749,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 9323, 9366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(135),
+            id: DeclarationId(137),
             name: Some("Map".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(50),
-                        value: DeclarationId(136),
+                        value: DeclarationId(138),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(51),
-                        value: DeclarationId(137),
+                        value: DeclarationId(139),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(136), DeclarationId(137)],
+            type_params: vec![DeclarationId(138), DeclarationId(139)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -10741,7 +10775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(136),
+            id: DeclarationId(138),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("key".to_string())),
             type_params: vec![],
@@ -10755,7 +10789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(137),
+            id: DeclarationId(139),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -10769,10 +10803,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(138),
+            id: DeclarationId(140),
             name: Some("CommitSha".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10786,10 +10820,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 10763, 10789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(139),
+            id: DeclarationId(141),
             name: Some("Sha256".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10803,7 +10837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 10857, 10883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(140),
+            id: DeclarationId(142),
             name: Some("RetryCount".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -10812,12 +10846,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(622)),
+            refinement: Some(DeclarationId(624)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 10884, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(141),
+            id: DeclarationId(143),
             name: Some("HttpStatus".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -10826,15 +10860,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(623)),
+            refinement: Some(DeclarationId(625)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 10936, 10991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(142),
+            id: DeclarationId(144),
             name: Some("Email".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10848,7 +10882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11065, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(143),
+            id: DeclarationId(145),
             name: Some("Port".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -10857,15 +10891,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(624)),
+            refinement: Some(DeclarationId(626)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11092, 11147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(144),
+            id: DeclarationId(146),
             name: Some("GistId".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10879,10 +10913,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11236, 11262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(145),
+            id: DeclarationId(147),
             name: Some("Secret".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10898,24 +10932,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11263, 11304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(146),
+            id: DeclarationId(148),
             name: Some("SecretValue".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(145))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(147))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(625)),
+            refinement: Some(DeclarationId(627)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11305, 11347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(147),
+            id: DeclarationId(149),
             name: Some("Url".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10929,10 +10963,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11408, 11434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(148),
+            id: DeclarationId(150),
             name: Some("SemVer".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -10946,82 +10980,82 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11507, 11533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(149),
+            id: DeclarationId(151),
             name: Some("NonEmptyStr".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(626)),
+            refinement: Some(DeclarationId(628)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11534, 11579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(150),
+            id: DeclarationId(152),
             name: Some("LanguageId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(627)),
+            refinement: Some(DeclarationId(629)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11580, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(151),
+            id: DeclarationId(153),
             name: Some("SecretName".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(628)),
+            refinement: Some(DeclarationId(630)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11626, 11671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(152),
+            id: DeclarationId(154),
             name: Some("PathSegment".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(629)),
+            refinement: Some(DeclarationId(631)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12306, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(153),
+            id: DeclarationId(155),
             name: Some("GlobSegment".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(630)),
+            refinement: Some(DeclarationId(632)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12366, 12425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(154),
+            id: DeclarationId(156),
             name: Some("FilePathParts".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segments".to_string(),
-                    ty: DeclarationId(512),
+                    ty: DeclarationId(514),
                 }],
             },
             type_params: vec![],
@@ -11035,12 +11069,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 12426, 12478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(155),
+            id: DeclarationId(157),
             name: Some("GlobPattern".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segments".to_string(),
-                    ty: DeclarationId(513),
+                    ty: DeclarationId(515),
                 }],
             },
             type_params: vec![],
@@ -11054,27 +11088,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 12479, 12529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(156),
+            id: DeclarationId(158),
             name: Some("FilePath".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(631)),
+            refinement: Some(DeclarationId(633)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12530, 12573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(157),
+            id: DeclarationId(159),
             name: Some("SourceSpan".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "start".to_string(),
@@ -11097,10 +11131,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 13191, 13251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(158),
+            id: DeclarationId(160),
             name: Some("Timestamp".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11114,7 +11148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 13351, 13377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(159),
+            id: DeclarationId(161),
             name: Some("EpochMs".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11123,12 +11157,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(632)),
+            refinement: Some(DeclarationId(634)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13378, 13422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(160),
+            id: DeclarationId(162),
             name: Some("Duration".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11137,12 +11171,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(633)),
+            refinement: Some(DeclarationId(635)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13423, 13467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(161),
+            id: DeclarationId(163),
             name: Some("Milliseconds".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11151,12 +11185,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(634)),
+            refinement: Some(DeclarationId(636)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13949, 13993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(162),
+            id: DeclarationId(164),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -11165,225 +11199,225 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(635)),
+            refinement: Some(DeclarationId(637)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13994, 14038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(163),
+            id: DeclarationId(165),
             name: Some("IntentId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(636)),
+            refinement: Some(DeclarationId(638)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14562, 14617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(164),
+            id: DeclarationId(166),
             name: Some("IssueId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(637)),
+            refinement: Some(DeclarationId(639)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14618, 14672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(165),
+            id: DeclarationId(167),
             name: Some("RunKey".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(638)),
+            refinement: Some(DeclarationId(640)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14673, 14726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(166),
+            id: DeclarationId(168),
             name: Some("ArtifactId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(639)),
+            refinement: Some(DeclarationId(641)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14727, 14784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(167),
+            id: DeclarationId(169),
             name: Some("LeaseToken".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(640)),
+            refinement: Some(DeclarationId(642)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14785, 14842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(168),
+            id: DeclarationId(170),
             name: Some("WorkerId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(641)),
+            refinement: Some(DeclarationId(643)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14843, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(169),
+            id: DeclarationId(171),
             name: Some("CommentId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(642)),
+            refinement: Some(DeclarationId(644)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14899, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(170),
+            id: DeclarationId(172),
             name: Some("SignalKey".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(643)),
+            refinement: Some(DeclarationId(645)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14956, 15012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(171),
+            id: DeclarationId(173),
             name: Some("ContentHash".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(644)),
+            refinement: Some(DeclarationId(646)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15013, 15071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(172),
+            id: DeclarationId(174),
             name: Some("WorkflowProducerId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(645)),
+            refinement: Some(DeclarationId(647)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15302, 15373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(173),
+            id: DeclarationId(175),
             name: Some("WorkflowObserverId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(646)),
+            refinement: Some(DeclarationId(648)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15374, 15445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(174),
+            id: DeclarationId(176),
             name: Some("WorkflowProverId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(647)),
+            refinement: Some(DeclarationId(649)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15446, 15513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(175),
+            id: DeclarationId(177),
             name: Some("WorkflowRunId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(648)),
+            refinement: Some(DeclarationId(650)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15514, 15575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(176),
+            id: DeclarationId(178),
             name: Some("GitRef".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(649)),
+            refinement: Some(DeclarationId(651)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15655, 15697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(177),
+            id: DeclarationId(179),
             name: Some("GcpProjectId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(650)),
+            refinement: Some(DeclarationId(652)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 16082, 16124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(178),
+            id: DeclarationId(180),
             name: Some("ServiceAccountEmail".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11397,21 +11431,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16249, 16282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(179),
+            id: DeclarationId(181),
             name: Some("Platform".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Linux".to_string(),
-                        ty: DeclarationId(514),
+                        ty: DeclarationId(516),
                     },
                     Field {
                         label: "Macos".to_string(),
-                        ty: DeclarationId(515),
+                        ty: DeclarationId(517),
                     },
                     Field {
                         label: "Windows".to_string(),
-                        ty: DeclarationId(516),
+                        ty: DeclarationId(518),
                     },
                 ],
             },
@@ -11426,25 +11460,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16668, 16711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(180),
+            id: DeclarationId(182),
             name: Some("TopologyNodeKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(517),
+                        ty: DeclarationId(519),
                     },
                     Field {
                         label: "Transport".to_string(),
-                        ty: DeclarationId(518),
+                        ty: DeclarationId(520),
                     },
                     Field {
                         label: "SubDag".to_string(),
-                        ty: DeclarationId(519),
+                        ty: DeclarationId(521),
                     },
                     Field {
                         label: "Env".to_string(),
-                        ty: DeclarationId(520),
+                        ty: DeclarationId(522),
                     },
                 ],
             },
@@ -11459,21 +11493,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16839, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(181),
+            id: DeclarationId(183),
             name: Some("DocSourceKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Template".to_string(),
-                        ty: DeclarationId(521),
+                        ty: DeclarationId(523),
                     },
                     Field {
                         label: "Generated".to_string(),
-                        ty: DeclarationId(522),
+                        ty: DeclarationId(524),
                     },
                     Field {
                         label: "Static".to_string(),
-                        ty: DeclarationId(523),
+                        ty: DeclarationId(525),
                     },
                 ],
             },
@@ -11488,29 +11522,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16895, 16948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(182),
+            id: DeclarationId(184),
             name: Some("FermiDepth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Xs".to_string(),
-                        ty: DeclarationId(524),
+                        ty: DeclarationId(526),
                     },
                     Field {
                         label: "S".to_string(),
-                        ty: DeclarationId(525),
+                        ty: DeclarationId(527),
                     },
                     Field {
                         label: "M".to_string(),
-                        ty: DeclarationId(526),
+                        ty: DeclarationId(528),
                     },
                     Field {
                         label: "L".to_string(),
-                        ty: DeclarationId(527),
+                        ty: DeclarationId(529),
                     },
                     Field {
                         label: "Xl".to_string(),
-                        ty: DeclarationId(528),
+                        ty: DeclarationId(530),
                     },
                 ],
             },
@@ -11525,29 +11559,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16950, 16987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(183),
+            id: DeclarationId(185),
             name: Some("CredentialFlow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Stored".to_string(),
-                        ty: DeclarationId(529),
+                        ty: DeclarationId(531),
                     },
                     Field {
                         label: "PlatformInjected".to_string(),
-                        ty: DeclarationId(530),
+                        ty: DeclarationId(532),
                     },
                     Field {
                         label: "WorkloadIdentity".to_string(),
-                        ty: DeclarationId(533),
+                        ty: DeclarationId(535),
                     },
                     Field {
                         label: "InteractiveAuth".to_string(),
-                        ty: DeclarationId(535),
+                        ty: DeclarationId(537),
                     },
                     Field {
                         label: "Chained".to_string(),
-                        ty: DeclarationId(537),
+                        ty: DeclarationId(539),
                     },
                 ],
             },
@@ -11562,53 +11596,53 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17235, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(184),
+            id: DeclarationId(186),
             name: Some("Arch".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "X86_64".to_string(),
-                        ty: DeclarationId(538),
+                        ty: DeclarationId(540),
                     },
                     Field {
                         label: "X86".to_string(),
-                        ty: DeclarationId(539),
+                        ty: DeclarationId(541),
                     },
                     Field {
                         label: "Aarch64".to_string(),
-                        ty: DeclarationId(540),
+                        ty: DeclarationId(542),
                     },
                     Field {
                         label: "Arm".to_string(),
-                        ty: DeclarationId(541),
+                        ty: DeclarationId(543),
                     },
                     Field {
                         label: "Armv7".to_string(),
-                        ty: DeclarationId(542),
+                        ty: DeclarationId(544),
                     },
                     Field {
                         label: "Mips".to_string(),
-                        ty: DeclarationId(543),
+                        ty: DeclarationId(545),
                     },
                     Field {
                         label: "Mipsel".to_string(),
-                        ty: DeclarationId(544),
+                        ty: DeclarationId(546),
                     },
                     Field {
                         label: "Mips64".to_string(),
-                        ty: DeclarationId(545),
+                        ty: DeclarationId(547),
                     },
                     Field {
                         label: "Mips64el".to_string(),
-                        ty: DeclarationId(546),
+                        ty: DeclarationId(548),
                     },
                     Field {
                         label: "Riscv64".to_string(),
-                        ty: DeclarationId(547),
+                        ty: DeclarationId(549),
                     },
                     Field {
                         label: "Wasm32".to_string(),
-                        ty: DeclarationId(548),
+                        ty: DeclarationId(550),
                     },
                 ],
             },
@@ -11623,25 +11657,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17632, 17735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(185),
+            id: DeclarationId(187),
             name: Some("Vendor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnknownVendor".to_string(),
-                        ty: DeclarationId(549),
+                        ty: DeclarationId(551),
                     },
                     Field {
                         label: "Pc".to_string(),
-                        ty: DeclarationId(550),
+                        ty: DeclarationId(552),
                     },
                     Field {
                         label: "Apple".to_string(),
-                        ty: DeclarationId(551),
+                        ty: DeclarationId(553),
                     },
                     Field {
                         label: "W64".to_string(),
-                        ty: DeclarationId(552),
+                        ty: DeclarationId(554),
                     },
                 ],
             },
@@ -11656,37 +11690,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17736, 17782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(186),
+            id: DeclarationId(188),
             name: Some("Os".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Linux".to_string(),
-                        ty: DeclarationId(553),
+                        ty: DeclarationId(555),
                     },
                     Field {
                         label: "Macos".to_string(),
-                        ty: DeclarationId(554),
+                        ty: DeclarationId(556),
                     },
                     Field {
                         label: "Windows".to_string(),
-                        ty: DeclarationId(555),
+                        ty: DeclarationId(557),
                     },
                     Field {
                         label: "Freebsd".to_string(),
-                        ty: DeclarationId(556),
+                        ty: DeclarationId(558),
                     },
                     Field {
                         label: "Android".to_string(),
-                        ty: DeclarationId(557),
+                        ty: DeclarationId(559),
                     },
                     Field {
                         label: "Ios".to_string(),
-                        ty: DeclarationId(558),
+                        ty: DeclarationId(560),
                     },
                     Field {
                         label: "Wasi".to_string(),
-                        ty: DeclarationId(559),
+                        ty: DeclarationId(561),
                     },
                 ],
             },
@@ -11701,45 +11735,45 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17783, 17849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(187),
+            id: DeclarationId(189),
             name: Some("AbiEnv".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoneAbi".to_string(),
-                        ty: DeclarationId(560),
+                        ty: DeclarationId(562),
                     },
                     Field {
                         label: "Gnu".to_string(),
-                        ty: DeclarationId(561),
+                        ty: DeclarationId(563),
                     },
                     Field {
                         label: "GnuEabi".to_string(),
-                        ty: DeclarationId(562),
+                        ty: DeclarationId(564),
                     },
                     Field {
                         label: "GnuEabihf".to_string(),
-                        ty: DeclarationId(563),
+                        ty: DeclarationId(565),
                     },
                     Field {
                         label: "Musl".to_string(),
-                        ty: DeclarationId(564),
+                        ty: DeclarationId(566),
                     },
                     Field {
                         label: "Msvc".to_string(),
-                        ty: DeclarationId(565),
+                        ty: DeclarationId(567),
                     },
                     Field {
                         label: "AndroidAbi".to_string(),
-                        ty: DeclarationId(566),
+                        ty: DeclarationId(568),
                     },
                     Field {
                         label: "Eabi".to_string(),
-                        ty: DeclarationId(567),
+                        ty: DeclarationId(569),
                     },
                     Field {
                         label: "Eabihf".to_string(),
-                        ty: DeclarationId(568),
+                        ty: DeclarationId(570),
                     },
                 ],
             },
@@ -11754,29 +11788,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17850, 17942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(188),
+            id: DeclarationId(190),
             name: Some("ExecutionEnv".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Native".to_string(),
-                        ty: DeclarationId(569),
+                        ty: DeclarationId(571),
                     },
                     Field {
                         label: "Wsl".to_string(),
-                        ty: DeclarationId(570),
+                        ty: DeclarationId(572),
                     },
                     Field {
                         label: "Container".to_string(),
-                        ty: DeclarationId(571),
+                        ty: DeclarationId(573),
                     },
                     Field {
                         label: "Ci".to_string(),
-                        ty: DeclarationId(572),
+                        ty: DeclarationId(574),
                     },
                     Field {
                         label: "Emulator".to_string(),
-                        ty: DeclarationId(573),
+                        ty: DeclarationId(575),
                     },
                 ],
             },
@@ -11791,25 +11825,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17943, 18003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(189),
+            id: DeclarationId(191),
             name: Some("TargetTriple".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "arch".to_string(),
-                        ty: DeclarationId(184),
+                        ty: DeclarationId(186),
                     },
                     Field {
                         label: "vendor".to_string(),
-                        ty: DeclarationId(185),
+                        ty: DeclarationId(187),
                     },
                     Field {
                         label: "os".to_string(),
-                        ty: DeclarationId(186),
+                        ty: DeclarationId(188),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(574),
+                        ty: DeclarationId(576),
                     },
                 ],
             },
@@ -11824,17 +11858,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18005, 18080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(190),
+            id: DeclarationId(192),
             name: Some("RuntimePlatform".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "host".to_string(),
-                        ty: DeclarationId(189),
+                        ty: DeclarationId(191),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(188),
+                        ty: DeclarationId(190),
                     },
                 ],
             },
@@ -11849,29 +11883,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18082, 18147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(191),
+            id: DeclarationId(193),
             name: Some("EntryKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RegularFile".to_string(),
-                        ty: DeclarationId(575),
+                        ty: DeclarationId(577),
                     },
                     Field {
                         label: "Directory".to_string(),
-                        ty: DeclarationId(576),
+                        ty: DeclarationId(578),
                     },
                     Field {
                         label: "Symlink".to_string(),
-                        ty: DeclarationId(577),
+                        ty: DeclarationId(579),
                     },
                     Field {
                         label: "Missing".to_string(),
-                        ty: DeclarationId(578),
+                        ty: DeclarationId(580),
                     },
                     Field {
                         label: "Other".to_string(),
-                        ty: DeclarationId(579),
+                        ty: DeclarationId(581),
                     },
                 ],
             },
@@ -11886,21 +11920,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18456, 18534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(192),
+            id: DeclarationId(194),
             name: Some("SymlinkTarget".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TargetFile".to_string(),
-                        ty: DeclarationId(580),
+                        ty: DeclarationId(582),
                     },
                     Field {
                         label: "TargetDir".to_string(),
-                        ty: DeclarationId(581),
+                        ty: DeclarationId(583),
                     },
                     Field {
                         label: "Broken".to_string(),
-                        ty: DeclarationId(582),
+                        ty: DeclarationId(584),
                     },
                 ],
             },
@@ -11915,10 +11949,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18664, 18722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(193),
+            id: DeclarationId(195),
             name: Some("TextFilePath".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11932,10 +11966,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 19883, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(194),
+            id: DeclarationId(196),
             name: Some("BinaryFilePath".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11949,10 +11983,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 19994, 20024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(195),
+            id: DeclarationId(197),
             name: Some("MimeType".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -11966,37 +12000,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 20241, 20263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(196),
+            id: DeclarationId(198),
             name: Some("HttpMethod".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GET".to_string(),
-                        ty: DeclarationId(583),
+                        ty: DeclarationId(585),
                     },
                     Field {
                         label: "POST".to_string(),
-                        ty: DeclarationId(584),
+                        ty: DeclarationId(586),
                     },
                     Field {
                         label: "PUT".to_string(),
-                        ty: DeclarationId(585),
+                        ty: DeclarationId(587),
                     },
                     Field {
                         label: "PATCH".to_string(),
-                        ty: DeclarationId(586),
+                        ty: DeclarationId(588),
                     },
                     Field {
                         label: "DELETE".to_string(),
-                        ty: DeclarationId(587),
+                        ty: DeclarationId(589),
                     },
                     Field {
                         label: "HEAD".to_string(),
-                        ty: DeclarationId(588),
+                        ty: DeclarationId(590),
                     },
                     Field {
                         label: "OPTIONS".to_string(),
-                        ty: DeclarationId(589),
+                        ty: DeclarationId(591),
                     },
                 ],
             },
@@ -12011,25 +12045,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21007, 21075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(197),
+            id: DeclarationId(199),
             name: Some("AuthScheme".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bearer".to_string(),
-                        ty: DeclarationId(590),
+                        ty: DeclarationId(592),
                     },
                     Field {
                         label: "Header".to_string(),
-                        ty: DeclarationId(591),
+                        ty: DeclarationId(593),
                     },
                     Field {
                         label: "Basic".to_string(),
-                        ty: DeclarationId(592),
+                        ty: DeclarationId(594),
                     },
                     Field {
                         label: "ApiKey".to_string(),
-                        ty: DeclarationId(593),
+                        ty: DeclarationId(595),
                     },
                 ],
             },
@@ -12044,21 +12078,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21543, 21639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(198),
+            id: DeclarationId(200),
             name: Some("AccessToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "token".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                     Field {
                         label: "scheme".to_string(),
-                        ty: DeclarationId(197),
+                        ty: DeclarationId(199),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(594),
+                        ty: DeclarationId(596),
                     },
                 ],
             },
@@ -12073,33 +12107,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21761, 21894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(199),
+            id: DeclarationId(201),
             name: Some("Credential".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "token".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                     Field {
                         label: "scheme".to_string(),
-                        ty: DeclarationId(197),
+                        ty: DeclarationId(199),
                     },
                     Field {
                         label: "header_name".to_string(),
-                        ty: DeclarationId(595),
+                        ty: DeclarationId(597),
                     },
                     Field {
                         label: "source_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "required_scopes".to_string(),
-                        ty: DeclarationId(596),
+                        ty: DeclarationId(598),
                     },
                     Field {
                         label: "expires_in".to_string(),
-                        ty: DeclarationId(597),
+                        ty: DeclarationId(599),
                     },
                 ],
             },
@@ -12114,67 +12148,67 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21896, 22046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(200),
+            id: DeclarationId(202),
             name: Some("FilesystemHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(156))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(158))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(651)),
+            refinement: Some(DeclarationId(653)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22123, 22187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(201),
+            id: DeclarationId(203),
             name: Some("NetworkHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(127))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(129))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(652)),
+            refinement: Some(DeclarationId(654)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22188, 22245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(202),
+            id: DeclarationId(204),
             name: Some("ToolHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(653)),
+            refinement: Some(DeclarationId(655)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22246, 22302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(203),
+            id: DeclarationId(205),
             name: Some("TransportRequest".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "method".to_string(),
-                        ty: DeclarationId(196),
+                        ty: DeclarationId(198),
                     },
                     Field {
                         label: "url".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12189,7 +12223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22379, 22470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(204),
+            id: DeclarationId(206),
             name: Some("TransportResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12199,11 +12233,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12218,21 +12252,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22472, 22543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(205),
+            id: DeclarationId(207),
             name: Some("FileResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "success".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12247,7 +12281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22545, 22615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(206),
+            id: DeclarationId(208),
             name: Some("ShellResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12257,11 +12291,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12276,7 +12310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22617, 22690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(207),
+            id: DeclarationId(209),
             name: Some("RestResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12286,11 +12320,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                 ],
             },
@@ -12305,29 +12339,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22692, 22756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(208),
+            id: DeclarationId(210),
             name: Some("TestResult".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ok".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "duration_ms".to_string(),
-                        ty: DeclarationId(161),
+                        ty: DeclarationId(163),
                     },
                 ],
             },
@@ -12342,7 +12376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22833, 22940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(209),
+            id: DeclarationId(211),
             name: Some("Summary".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -12371,29 +12405,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22942, 22999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(210),
+            id: DeclarationId(212),
             name: Some("StageResult".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "success".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "skipped".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -12408,21 +12442,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23001, 23102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(211),
+            id: DeclarationId(213),
             name: Some("DocumentLine".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "is_comment".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "is_blank".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -12437,21 +12471,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23255, 23327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(212),
+            id: DeclarationId(214),
             name: Some("DocumentSection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "has_title".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "lines".to_string(),
-                        ty: DeclarationId(598),
+                        ty: DeclarationId(600),
                     },
                 ],
             },
@@ -12466,29 +12500,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23329, 23415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(213),
+            id: DeclarationId(215),
             name: Some("Document".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "header".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "has_header".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "comment_prefix".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "sections".to_string(),
-                        ty: DeclarationId(599),
+                        ty: DeclarationId(601),
                     },
                     Field {
                         label: "trailing_newline".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -12503,17 +12537,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23417, 23554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(214),
+            id: DeclarationId(216),
             name: Some("TextFile".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document".to_string(),
-                        ty: DeclarationId(213),
+                        ty: DeclarationId(215),
                     },
                 ],
             },
@@ -12528,17 +12562,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23556, 23609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(215),
+            id: DeclarationId(217),
             name: Some("RenderedTextFile".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -12553,21 +12587,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23611, 23669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(216),
+            id: DeclarationId(218),
             name: Some("ToolEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(600),
+                        ty: DeclarationId(602),
                     },
                 ],
             },
@@ -12582,12 +12616,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23746, 23820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(217),
+            id: DeclarationId(219),
             name: Some("ToolRegistry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tools".to_string(),
-                    ty: DeclarationId(601),
+                    ty: DeclarationId(603),
                 }],
             },
             type_params: vec![],
@@ -12601,21 +12635,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23822, 23868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(218),
+            id: DeclarationId(220),
             name: Some("DagTopology".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(602),
+                        ty: DeclarationId(604),
                     },
                     Field {
                         label: "edges".to_string(),
-                        ty: DeclarationId(603),
+                        ty: DeclarationId(605),
                     },
                     Field {
                         label: "subdag_boundaries".to_string(),
-                        ty: DeclarationId(604),
+                        ty: DeclarationId(606),
                     },
                 ],
             },
@@ -12630,25 +12664,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24127, 24237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(219),
+            id: DeclarationId(221),
             name: Some("TopologyNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(180),
+                        ty: DeclarationId(182),
                     },
                     Field {
                         label: "parent".to_string(),
-                        ty: DeclarationId(605),
+                        ty: DeclarationId(607),
                     },
                 ],
             },
@@ -12663,21 +12697,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24239, 24359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(220),
+            id: DeclarationId(222),
             name: Some("TopologyEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "from".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "to".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "port".to_string(),
-                        ty: DeclarationId(606),
+                        ty: DeclarationId(608),
                     },
                 ],
             },
@@ -12692,21 +12726,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24361, 24426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(221),
+            id: DeclarationId(223),
             name: Some("DagDiff".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "added".to_string(),
-                        ty: DeclarationId(607),
+                        ty: DeclarationId(609),
                     },
                     Field {
                         label: "removed".to_string(),
-                        ty: DeclarationId(608),
+                        ty: DeclarationId(610),
                     },
                     Field {
                         label: "changed".to_string(),
-                        ty: DeclarationId(609),
+                        ty: DeclarationId(611),
                     },
                 ],
             },
@@ -12721,29 +12755,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24428, 24514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(222),
+            id: DeclarationId(224),
             name: Some("CodegenTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "backend".to_string(),
-                        ty: DeclarationId(610),
+                        ty: DeclarationId(612),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(611),
+                        ty: DeclarationId(613),
                     },
                     Field {
                         label: "runtime_env".to_string(),
-                        ty: DeclarationId(612),
+                        ty: DeclarationId(614),
                     },
                 ],
             },
@@ -12758,25 +12792,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24583, 24717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(223),
+            id: DeclarationId(225),
             name: Some("CodegenBackend".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Rust".to_string(),
-                        ty: DeclarationId(613),
+                        ty: DeclarationId(615),
                     },
                     Field {
                         label: "Go".to_string(),
-                        ty: DeclarationId(614),
+                        ty: DeclarationId(616),
                     },
                     Field {
                         label: "C".to_string(),
-                        ty: DeclarationId(615),
+                        ty: DeclarationId(617),
                     },
                     Field {
                         label: "Mips".to_string(),
-                        ty: DeclarationId(616),
+                        ty: DeclarationId(618),
                     },
                 ],
             },
@@ -12791,21 +12825,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24719, 24761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(224),
+            id: DeclarationId(226),
             name: Some("PragmaDirective".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "key".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(617),
+                        ty: DeclarationId(619),
                     },
                 ],
             },
@@ -12820,17 +12854,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24763, 24834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(225),
+            id: DeclarationId(227),
             name: Some("DocSource".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(181),
+                        ty: DeclarationId(183),
                     },
                 ],
             },
@@ -12845,10 +12879,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24975, 25032),
         });
         declarations.push(Declaration {
-            id: DeclarationId(226),
+            id: DeclarationId(228),
             name: Some("ReferenceModel".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
-            type_params: vec![DeclarationId(227)],
+            type_params: vec![DeclarationId(229)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -12859,7 +12893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 26966, 26985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(227),
+            id: DeclarationId(229),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -12873,13 +12907,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 26966, 26985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(228),
+            id: DeclarationId(230),
             name: Some("String".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(130),
+                    value: DeclarationId(132),
                 }],
             },
             type_params: vec![],
@@ -12893,25 +12927,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/string_type.dag", 520, 550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(229),
+            id: DeclarationId(231),
             name: Some("CharClass".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Whitespace".to_string(),
-                        ty: DeclarationId(654),
+                        ty: DeclarationId(656),
                     },
                     Field {
                         label: "Digit".to_string(),
-                        ty: DeclarationId(655),
+                        ty: DeclarationId(657),
                     },
                     Field {
                         label: "IdentStart".to_string(),
-                        ty: DeclarationId(656),
+                        ty: DeclarationId(658),
                     },
                     Field {
                         label: "IdentContinue".to_string(),
-                        ty: DeclarationId(657),
+                        ty: DeclarationId(659),
                     },
                 ],
             },
@@ -12926,11 +12960,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 3662, 3726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(230),
+            id: DeclarationId(232),
             name: Some("char_in_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130), DeclarationId(229)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(132), DeclarationId(231)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 3780, 4378)),
             },
             type_params: vec![],
@@ -12944,21 +12978,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 3728, 4378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(231),
+            id: DeclarationId(233),
             name: Some("DisplayWidth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(658),
+                        ty: DeclarationId(660),
                     },
                     Field {
                         label: "Narrow".to_string(),
-                        ty: DeclarationId(659),
+                        ty: DeclarationId(661),
                     },
                     Field {
                         label: "Wide".to_string(),
-                        ty: DeclarationId(660),
+                        ty: DeclarationId(662),
                     },
                 ],
             },
@@ -12973,10 +13007,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 4742, 4787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(232),
+            id: DeclarationId(234),
             name: Some("display_width_columns".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(231)],
+                inputs: vec![DeclarationId(233)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 4838, 4914)),
             },
@@ -12991,13 +13025,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 4789, 4914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(233),
+            id: DeclarationId(235),
             name: Some("UnicodeBlock".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "start".to_string(),
@@ -13009,7 +13043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "default_width".to_string(),
-                        ty: DeclarationId(231),
+                        ty: DeclarationId(233),
                     },
                 ],
             },
@@ -13024,18 +13058,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 5149, 5249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(234),
+            id: DeclarationId(236),
             name: Some("zero_width_blocks".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(661)),
+            meta_tag: Some(DeclarationId(663)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -13057,7 +13091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13080,7 +13114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13103,7 +13137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13126,7 +13160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13147,7 +13181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13170,7 +13204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -13181,18 +13215,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 5311, 6060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(235),
+            id: DeclarationId(237),
             name: Some("zero_width_codepoints".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(662)),
+            meta_tag: Some(DeclarationId(664)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -13206,18 +13240,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 6127, 6339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(236),
+            id: DeclarationId(238),
             name: Some("wide_blocks".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(663)),
+            meta_tag: Some(DeclarationId(665)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -13237,7 +13271,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13260,7 +13294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13283,7 +13317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13304,7 +13338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13327,7 +13361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13350,7 +13384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13371,7 +13405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13394,7 +13428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13417,7 +13451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13438,7 +13472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13459,7 +13493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13480,7 +13514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13501,7 +13535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13524,7 +13558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13547,7 +13581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13568,7 +13602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -13579,10 +13613,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 6386, 8175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(237),
+            id: DeclarationId(239),
             name: Some("code_point".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
+                inputs: vec![DeclarationId(132)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8355, 8366)),
             },
@@ -13597,11 +13631,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 8325, 8366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(238),
+            id: DeclarationId(240),
             name: Some("in_block".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(233)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(93), DeclarationId(235)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8418, 8470)),
             },
             type_params: vec![],
@@ -13615,11 +13649,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 8368, 8470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(239),
+            id: DeclarationId(241),
             name: Some("char_display_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
-                output: DeclarationId(231),
+                inputs: vec![DeclarationId(132)],
+                output: DeclarationId(233),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8519, 8822)),
             },
             type_params: vec![],
@@ -13633,10 +13667,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 8472, 8822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(240),
+            id: DeclarationId(242),
             name: Some("char_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
+                inputs: vec![DeclarationId(132)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8854, 8910)),
             },
@@ -13651,10 +13685,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 8824, 8910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(241),
+            id: DeclarationId(243),
             name: Some("string_display_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
+                inputs: vec![DeclarationId(230)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8954, 9092)),
             },
@@ -13669,11 +13703,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 8912, 9092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(242),
+            id: DeclarationId(244),
             name: Some("repeat_string_loop".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/std/render_repeat_string_bootstrap.dag",
                     598,
@@ -13691,11 +13725,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/render_repeat_string_bootstrap.dag", 526, 717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(243),
+            id: DeclarationId(245),
             name: Some("repeat_string".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/std/render_repeat_string_bootstrap.dag",
                     765,
@@ -13713,12 +13747,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/render_repeat_string_bootstrap.dag", 719, 818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(244),
+            id: DeclarationId(246),
             name: Some("MethodDeclaration".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -13732,15 +13766,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 4779, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(245),
+            id: DeclarationId(247),
             name: Some("add_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13754,15 +13788,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5269, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(246),
+            id: DeclarationId(248),
             name: Some("all_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13776,15 +13810,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5322, 5374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(247),
+            id: DeclarationId(249),
             name: Some("any_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13798,15 +13832,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5375, 5427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(248),
+            id: DeclarationId(250),
             name: Some("append_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13820,15 +13854,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5428, 5486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(249),
+            id: DeclarationId(251),
             name: Some("bottom_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13842,15 +13876,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5487, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(250),
+            id: DeclarationId(252),
             name: Some("chars_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13864,15 +13898,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5546, 5602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(251),
+            id: DeclarationId(253),
             name: Some("clamp_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13886,15 +13920,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5603, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(252),
+            id: DeclarationId(254),
             name: Some("compare_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13908,15 +13942,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5660, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(253),
+            id: DeclarationId(255),
             name: Some("complement_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13930,15 +13964,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5721, 5787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(254),
+            id: DeclarationId(256),
             name: Some("concat_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13952,15 +13986,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5788, 5846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(255),
+            id: DeclarationId(257),
             name: Some("contains_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13974,15 +14008,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5847, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(256),
+            id: DeclarationId(258),
             name: Some("count_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -13996,15 +14030,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5910, 5966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(257),
+            id: DeclarationId(259),
             name: Some("diff_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14018,15 +14052,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 5967, 6021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(258),
+            id: DeclarationId(260),
             name: Some("empty_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14040,15 +14074,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6022, 6078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(259),
+            id: DeclarationId(261),
             name: Some("ends_with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14062,15 +14096,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6079, 6143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(260),
+            id: DeclarationId(262),
             name: Some("enumerate_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14084,15 +14118,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6144, 6208),
         });
         declarations.push(Declaration {
-            id: DeclarationId(261),
+            id: DeclarationId(263),
             name: Some("filter_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14106,15 +14140,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6209, 6267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(262),
+            id: DeclarationId(264),
             name: Some("first_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14128,15 +14162,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6268, 6324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(263),
+            id: DeclarationId(265),
             name: Some("flat_map_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14150,15 +14184,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6325, 6387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(264),
+            id: DeclarationId(266),
             name: Some("fold_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14172,15 +14206,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6388, 6442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(265),
+            id: DeclarationId(267),
             name: Some("get_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14194,15 +14228,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6443, 6495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(266),
+            id: DeclarationId(268),
             name: Some("has_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14216,15 +14250,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6496, 6548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(267),
+            id: DeclarationId(269),
             name: Some("intersect_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14238,15 +14272,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6549, 6613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(268),
+            id: DeclarationId(270),
             name: Some("is_empty_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14260,15 +14294,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6614, 6676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(269),
+            id: DeclarationId(271),
             name: Some("join_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14282,15 +14316,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6677, 6731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(270),
+            id: DeclarationId(272),
             name: Some("keys_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14304,15 +14338,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6732, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(271),
+            id: DeclarationId(273),
             name: Some("last_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14326,15 +14360,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6787, 6841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(272),
+            id: DeclarationId(274),
             name: Some("length_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14348,15 +14382,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6842, 6900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(273),
+            id: DeclarationId(275),
             name: Some("list_push_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14370,15 +14404,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6901, 6965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(274),
+            id: DeclarationId(276),
             name: Some("lookup_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14392,15 +14426,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 6966, 7024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(275),
+            id: DeclarationId(277),
             name: Some("map_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14414,15 +14448,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7025, 7077),
         });
         declarations.push(Declaration {
-            id: DeclarationId(276),
+            id: DeclarationId(278),
             name: Some("map_contains_key_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14436,15 +14470,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7078, 7156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(277),
+            id: DeclarationId(279),
             name: Some("map_get_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14458,15 +14492,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7157, 7217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(278),
+            id: DeclarationId(280),
             name: Some("map_has_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14480,15 +14514,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7218, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(279),
+            id: DeclarationId(281),
             name: Some("map_insert_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14502,15 +14536,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7279, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(280),
+            id: DeclarationId(282),
             name: Some("map_keys_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14524,15 +14558,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7346, 7408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(281),
+            id: DeclarationId(283),
             name: Some("map_merge_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14546,15 +14580,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7409, 7473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(282),
+            id: DeclarationId(284),
             name: Some("map_values_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14568,15 +14602,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7474, 7540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(283),
+            id: DeclarationId(285),
             name: Some("meet_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14590,15 +14624,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7541, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(284),
+            id: DeclarationId(286),
             name: Some("member_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14612,15 +14646,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7596, 7654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(285),
+            id: DeclarationId(287),
             name: Some("mul_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14634,15 +14668,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7655, 7707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(286),
+            id: DeclarationId(288),
             name: Some("negate_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14656,15 +14690,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7708, 7766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(287),
+            id: DeclarationId(289),
             name: Some("one_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14678,15 +14712,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7767, 7819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(288),
+            id: DeclarationId(290),
             name: Some("reciprocal_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14700,15 +14734,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7820, 7886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(289),
+            id: DeclarationId(291),
             name: Some("replace_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14722,15 +14756,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7887, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(290),
+            id: DeclarationId(292),
             name: Some("reverse_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14744,15 +14778,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 7948, 8008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(291),
+            id: DeclarationId(293),
             name: Some("skip_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14766,15 +14800,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8009, 8063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(292),
+            id: DeclarationId(294),
             name: Some("sort_by_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14788,15 +14822,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8064, 8124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(293),
+            id: DeclarationId(295),
             name: Some("split_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14810,15 +14844,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8125, 8181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(294),
+            id: DeclarationId(296),
             name: Some("starts_with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14832,15 +14866,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8182, 8250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(295),
+            id: DeclarationId(297),
             name: Some("string_contains_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14854,15 +14888,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8251, 8327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(296),
+            id: DeclarationId(298),
             name: Some("substring_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14876,15 +14910,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8328, 8392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(297),
+            id: DeclarationId(299),
             name: Some("take_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14898,15 +14932,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8393, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(298),
+            id: DeclarationId(300),
             name: Some("to_int_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14920,15 +14954,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8448, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(299),
+            id: DeclarationId(301),
             name: Some("to_lower_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14942,15 +14976,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8507, 8569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(300),
+            id: DeclarationId(302),
             name: Some("to_string_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14964,15 +14998,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8570, 8634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(301),
+            id: DeclarationId(303),
             name: Some("to_upper_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -14986,15 +15020,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8635, 8697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(302),
+            id: DeclarationId(304),
             name: Some("top_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15008,15 +15042,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8698, 8750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(303),
+            id: DeclarationId(305),
             name: Some("trim_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15030,15 +15064,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8751, 8805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(304),
+            id: DeclarationId(306),
             name: Some("union_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15052,15 +15086,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8806, 8862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(305),
+            id: DeclarationId(307),
             name: Some("values_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15074,15 +15108,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8863, 8921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(306),
+            id: DeclarationId(308),
             name: Some("with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15096,15 +15130,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8922, 8976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(307),
+            id: DeclarationId(309),
             name: Some("zero_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -15118,7 +15152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/methods.dag", 8977, 9031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(308),
+            id: DeclarationId(310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15132,7 +15166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/logic.dag", 304, 308),
         });
         declarations.push(Declaration {
-            id: DeclarationId(309),
+            id: DeclarationId(311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15146,12 +15180,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/logic.dag", 311, 316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(310),
+            id: DeclarationId(312),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(4),
                 }],
             },
@@ -15166,12 +15200,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/bit.dag", 1023, 1032),
         });
         declarations.push(Declaration {
-            id: DeclarationId(311),
+            id: DeclarationId(313),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(4),
                 }],
             },
@@ -15186,12 +15220,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/bit.dag", 1136, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(312),
+            id: DeclarationId(314),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15206,12 +15240,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/bit.dag", 1272, 1282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(313),
+            id: DeclarationId(315),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15226,12 +15260,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/bit.dag", 1306, 1316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(314),
+            id: DeclarationId(316),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15246,12 +15280,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/bit.dag", 1340, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(315),
+            id: DeclarationId(317),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -15266,7 +15300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/bit.dag", 1375, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(316),
+            id: DeclarationId(318),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -15285,7 +15319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/error_primitives.dag", 620, 636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(317),
+            id: DeclarationId(319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -15304,7 +15338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/error_primitives.dag", 639, 657),
         });
         declarations.push(Declaration {
-            id: DeclarationId(318),
+            id: DeclarationId(320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15318,7 +15352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/error_primitives.dag", 936, 948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(319),
+            id: DeclarationId(321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -15332,12 +15366,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/error_primitives.dag", 951, 959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(320),
+            id: DeclarationId(322),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15352,12 +15386,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 24186, 24212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(321),
+            id: DeclarationId(323),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15372,12 +15406,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 25393, 25419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(322),
+            id: DeclarationId(324),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15392,12 +15426,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 26550, 26576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(323),
+            id: DeclarationId(325),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15412,12 +15446,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 27676, 27702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(324),
+            id: DeclarationId(326),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15432,12 +15466,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 31087, 31113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(325),
+            id: DeclarationId(327),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15452,12 +15486,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 34394, 34420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(326),
+            id: DeclarationId(328),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15472,12 +15506,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 39723, 39749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(327),
+            id: DeclarationId(329),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -15492,13 +15526,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 42637, 42663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(328),
+            id: DeclarationId(330),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -15512,7 +15546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 43456, 43468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(329),
+            id: DeclarationId(331),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(16), DeclarationId(16)],
@@ -15530,7 +15564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 4724, 4737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(330),
+            id: DeclarationId(332),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(18), DeclarationId(18)],
@@ -15548,7 +15582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 4843, 4856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(331),
+            id: DeclarationId(333),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(20), DeclarationId(20)],
@@ -15566,7 +15600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 5060, 5073),
         });
         declarations.push(Declaration {
-            id: DeclarationId(332),
+            id: DeclarationId(334),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(22), DeclarationId(22)],
@@ -15584,7 +15618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 5182, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(333),
+            id: DeclarationId(335),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(24), DeclarationId(24)],
@@ -15602,7 +15636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 5333, 5346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(334),
+            id: DeclarationId(336),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(24)],
@@ -15620,7 +15654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(335),
+            id: DeclarationId(337),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(26), DeclarationId(26)],
@@ -15638,7 +15672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 5451, 5464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(336),
+            id: DeclarationId(338),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(26)],
@@ -15656,7 +15690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 5490, 5500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(337),
+            id: DeclarationId(339),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(32), DeclarationId(32)],
@@ -15674,7 +15708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 10528, 10541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(338),
+            id: DeclarationId(340),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(32), DeclarationId(32)],
@@ -15692,7 +15726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 10559, 10572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(339),
+            id: DeclarationId(341),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(34), DeclarationId(34)],
@@ -15710,7 +15744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 11014, 11027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(340),
+            id: DeclarationId(342),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(34), DeclarationId(34)],
@@ -15728,7 +15762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 11045, 11058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(341),
+            id: DeclarationId(343),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36), DeclarationId(36)],
@@ -15746,7 +15780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 11218, 11231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(342),
+            id: DeclarationId(344),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36)],
@@ -15764,7 +15798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 11252, 11262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(343),
+            id: DeclarationId(345),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36), DeclarationId(36)],
@@ -15782,7 +15816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 11270, 11283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(344),
+            id: DeclarationId(346),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15800,7 +15834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12084, 12097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(345),
+            id: DeclarationId(347),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15818,7 +15852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12105, 12118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(346),
+            id: DeclarationId(348),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38)],
@@ -15836,7 +15870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12139, 12149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(347),
+            id: DeclarationId(349),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15854,7 +15888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12157, 12170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(348),
+            id: DeclarationId(350),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -15880,11 +15914,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12190, 12209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(349),
+            id: DeclarationId(351),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(348),
+                output: DeclarationId(350),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15898,7 +15932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12178, 12209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(350),
+            id: DeclarationId(352),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -15916,11 +15950,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12230, 12250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(351),
+            id: DeclarationId(353),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15934,11 +15968,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12257, 12273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(352),
+            id: DeclarationId(354),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15952,11 +15986,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12280, 12296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(353),
+            id: DeclarationId(355),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15970,11 +16004,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12303, 12319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(354),
+            id: DeclarationId(356),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -15988,11 +16022,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12326, 12342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(355),
+            id: DeclarationId(357),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16006,11 +16040,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12349, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(356),
+            id: DeclarationId(358),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16024,7 +16058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12372, 12388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(357),
+            id: DeclarationId(359),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -16042,7 +16076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12551, 12564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(358),
+            id: DeclarationId(360),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40)],
@@ -16060,7 +16094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12585, 12595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(359),
+            id: DeclarationId(361),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -16078,7 +16112,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12603, 12616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(360),
+            id: DeclarationId(362),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40)],
@@ -16096,7 +16130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12640, 12650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(361),
+            id: DeclarationId(363),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -16114,7 +16148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 12662, 12682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(362),
+            id: DeclarationId(364),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(42), DeclarationId(42)],
@@ -16132,7 +16166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 13030, 13043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(363),
+            id: DeclarationId(365),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(42), DeclarationId(42)],
@@ -16150,7 +16184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 13052, 13065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(364),
+            id: DeclarationId(366),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(44), DeclarationId(44)],
@@ -16168,7 +16202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 13208, 13221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(365),
+            id: DeclarationId(367),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(44), DeclarationId(44)],
@@ -16186,7 +16220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 13230, 13243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(366),
+            id: DeclarationId(368),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46), DeclarationId(46)],
@@ -16204,7 +16238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 13497, 13510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(367),
+            id: DeclarationId(369),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46), DeclarationId(46)],
@@ -16222,7 +16256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 13519, 13532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(368),
+            id: DeclarationId(370),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46)],
@@ -16240,7 +16274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 13547, 13557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(369),
+            id: DeclarationId(371),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16260,7 +16294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17529, 17542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(370),
+            id: DeclarationId(372),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16280,7 +16314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17544, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(371),
+            id: DeclarationId(373),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16300,11 +16334,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17562, 17575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(372),
+            id: DeclarationId(374),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(369), DeclarationId(370)],
-                output: DeclarationId(371),
+                inputs: vec![DeclarationId(371), DeclarationId(372)],
+                output: DeclarationId(373),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16318,7 +16352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17526, 17575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(373),
+            id: DeclarationId(375),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16338,7 +16372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17585, 17598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(374),
+            id: DeclarationId(376),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16358,11 +16392,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17618, 17631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(375),
+            id: DeclarationId(377),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(374),
+                output: DeclarationId(376),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16376,7 +16410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17609, 17631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(376),
+            id: DeclarationId(378),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16396,11 +16430,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17733, 17746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(377),
+            id: DeclarationId(379),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(376),
+                output: DeclarationId(378),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16414,7 +16448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17717, 17746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(378),
+            id: DeclarationId(380),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -16432,11 +16466,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17757, 17768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(379),
+            id: DeclarationId(381),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16450,7 +16484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17781, 17793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(380),
+            id: DeclarationId(382),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -16468,7 +16502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17803, 17814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(381),
+            id: DeclarationId(383),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -16487,11 +16521,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(382),
+            id: DeclarationId(384),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(381),
+                output: DeclarationId(383),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16505,7 +16539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17824, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(383),
+            id: DeclarationId(385),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -16524,11 +16558,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(384),
+            id: DeclarationId(386),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(383),
+                output: DeclarationId(385),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16542,7 +16576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17843, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(385),
+            id: DeclarationId(387),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
@@ -16560,7 +16594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17951, 17961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(386),
+            id: DeclarationId(388),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16580,11 +16614,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17966, 17979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(387),
+            id: DeclarationId(389),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(385)],
-                output: DeclarationId(386),
+                inputs: vec![DeclarationId(387)],
+                output: DeclarationId(388),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16598,11 +16632,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17948, 17979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(388),
+            id: DeclarationId(390),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16616,7 +16650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17993, 18006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(389),
+            id: DeclarationId(391),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16636,11 +16670,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18011, 18024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(390),
+            id: DeclarationId(392),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(388)],
-                output: DeclarationId(389),
+                inputs: vec![DeclarationId(390)],
+                output: DeclarationId(391),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16654,7 +16688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17990, 18024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(391),
+            id: DeclarationId(393),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48), DeclarationId(48)],
@@ -16672,10 +16706,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18039, 18052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(392),
+            id: DeclarationId(394),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(48), DeclarationId(391)],
+                inputs: vec![DeclarationId(48), DeclarationId(393)],
                 output: DeclarationId(48),
                 body: ArrowBody::NoBody,
             },
@@ -16690,7 +16724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18033, 18058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(393),
+            id: DeclarationId(395),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16710,11 +16744,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18083, 18096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(394),
+            id: DeclarationId(396),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(393),
+                output: DeclarationId(395),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16728,7 +16762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18074, 18096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(395),
+            id: DeclarationId(397),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16748,11 +16782,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18101, 18114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(396),
+            id: DeclarationId(398),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(394)],
-                output: DeclarationId(395),
+                inputs: vec![DeclarationId(396)],
+                output: DeclarationId(397),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16766,11 +16800,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18071, 18114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(397),
+            id: DeclarationId(399),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16784,11 +16818,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18125, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(398),
+            id: DeclarationId(400),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(397)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(399)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16802,11 +16836,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18122, 18147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(399),
+            id: DeclarationId(401),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16820,11 +16854,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18158, 18171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(400),
+            id: DeclarationId(402),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(399)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(401)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16838,7 +16872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18155, 18180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(401),
+            id: DeclarationId(403),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::UnresolvedIdentifier(
                 "Tuple".to_string(),
@@ -16854,10 +16888,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18245, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(402),
+            id: DeclarationId(404),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(401),
+                template: DeclarationId(403),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -16871,13 +16905,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18245, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(403),
+            id: DeclarationId(405),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(402),
+                    value: DeclarationId(404),
                 }],
             },
             type_params: vec![],
@@ -16891,11 +16925,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18234, 18259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(404),
+            id: DeclarationId(406),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(403),
+                output: DeclarationId(405),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16909,7 +16943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18226, 18259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(405),
+            id: DeclarationId(407),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16929,11 +16963,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18279, 18292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(406),
+            id: DeclarationId(408),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(405),
+                output: DeclarationId(407),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16947,7 +16981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18271, 18292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(407),
+            id: DeclarationId(409),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -16967,11 +17001,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18312, 18325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(408),
+            id: DeclarationId(410),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(407),
+                output: DeclarationId(409),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -16985,7 +17019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18301, 18325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(409),
+            id: DeclarationId(411),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17005,11 +17039,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18345, 18358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(410),
+            id: DeclarationId(412),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(409),
+                output: DeclarationId(411),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17023,7 +17057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18334, 18358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(411),
+            id: DeclarationId(413),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48), DeclarationId(48)],
@@ -17041,7 +17075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18373, 18388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(412),
+            id: DeclarationId(414),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17061,11 +17095,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18393, 18406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(413),
+            id: DeclarationId(415),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(411)],
-                output: DeclarationId(412),
+                inputs: vec![DeclarationId(413)],
+                output: DeclarationId(414),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17079,11 +17113,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18370, 18406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(414),
+            id: DeclarationId(416),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17097,7 +17131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18419, 18432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(415),
+            id: DeclarationId(417),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17116,11 +17150,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(416),
+            id: DeclarationId(418),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(415),
+                output: DeclarationId(417),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17134,7 +17168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18988, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(417),
+            id: DeclarationId(419),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17160,7 +17194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19009, 19030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(418),
+            id: DeclarationId(420),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17179,11 +17213,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(419),
+            id: DeclarationId(421),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(418),
+                output: DeclarationId(420),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17197,7 +17231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19038, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(420),
+            id: DeclarationId(422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17223,11 +17257,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19072, 19093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(421),
+            id: DeclarationId(423),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50), DeclarationId(51)],
-                output: DeclarationId(420),
+                output: DeclarationId(422),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17241,7 +17275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19060, 19093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(422),
+            id: DeclarationId(424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17267,7 +17301,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19106, 19127),
         });
         declarations.push(Declaration {
-            id: DeclarationId(423),
+            id: DeclarationId(425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -17293,11 +17327,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19132, 19153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(424),
+            id: DeclarationId(426),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(422)],
-                output: DeclarationId(423),
+                inputs: vec![DeclarationId(424)],
+                output: DeclarationId(425),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17311,7 +17345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19103, 19153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(425),
+            id: DeclarationId(427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17331,11 +17365,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19170, 19183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(426),
+            id: DeclarationId(428),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(425),
+                output: DeclarationId(427),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17349,7 +17383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19162, 19183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(427),
+            id: DeclarationId(429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -17369,11 +17403,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19202, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(428),
+            id: DeclarationId(430),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(427),
+                output: DeclarationId(429),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17387,11 +17421,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19194, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(429),
+            id: DeclarationId(431),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17405,11 +17439,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19223, 19236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(430),
+            id: DeclarationId(432),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -17423,7 +17457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19253, 19266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(431),
+            id: DeclarationId(433),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -17441,7 +17475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19275, 19286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(432),
+            id: DeclarationId(434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17455,7 +17489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19505, 19509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(433),
+            id: DeclarationId(435),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17469,7 +17503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19512, 19517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(434),
+            id: DeclarationId(436),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17483,7 +17517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19520, 19527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(435),
+            id: DeclarationId(437),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17497,7 +17531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21636, 21654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(436),
+            id: DeclarationId(438),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17511,7 +17545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21659, 21682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(437),
+            id: DeclarationId(439),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17525,7 +17559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21687, 21708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(438),
+            id: DeclarationId(440),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17539,7 +17573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21713, 21744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(439),
+            id: DeclarationId(441),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17553,7 +17587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21749, 21772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(440),
+            id: DeclarationId(442),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17567,7 +17601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21777, 21804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(441),
+            id: DeclarationId(443),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17581,7 +17615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21809, 21831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(442),
+            id: DeclarationId(444),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17595,12 +17629,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21858, 21872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(443),
+            id: DeclarationId(445),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -17614,7 +17648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21877, 21899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(444),
+            id: DeclarationId(446),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17628,7 +17662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21930, 21942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(445),
+            id: DeclarationId(447),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17642,7 +17676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21947, 21962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(446),
+            id: DeclarationId(448),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17656,7 +17690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21967, 21978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(447),
+            id: DeclarationId(449),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17670,12 +17704,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 21983, 21996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(448),
+            id: DeclarationId(450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -17689,7 +17723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22001, 22031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(449),
+            id: DeclarationId(451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -17714,7 +17748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22036, 22105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(450),
+            id: DeclarationId(452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -17733,7 +17767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22110, 22151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(451),
+            id: DeclarationId(453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -17758,12 +17792,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22156, 22223),
         });
         declarations.push(Declaration {
-            id: DeclarationId(452),
+            id: DeclarationId(454),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(55),
                 }],
             },
@@ -17778,13 +17812,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22249, 22274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(453),
+            id: DeclarationId(455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(452),
+                        ty: DeclarationId(454),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -17803,12 +17837,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22228, 22310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(454),
+            id: DeclarationId(456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "id".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -17822,7 +17856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22315, 22349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(455),
+            id: DeclarationId(457),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17836,7 +17870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22595, 22607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(456),
+            id: DeclarationId(458),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17850,7 +17884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22665, 22681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(457),
+            id: DeclarationId(459),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17864,7 +17898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 22728, 22742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(458),
+            id: DeclarationId(460),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17878,7 +17912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23219, 23232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(459),
+            id: DeclarationId(461),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17892,7 +17926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23248, 23263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(460),
+            id: DeclarationId(462),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17906,7 +17940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23309, 23325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(461),
+            id: DeclarationId(463),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -17920,12 +17954,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23372, 23385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(462),
+            id: DeclarationId(464),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(55),
                 }],
             },
@@ -17940,7 +17974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23468, 23493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(463),
+            id: DeclarationId(465),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17959,7 +17993,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(464),
+            id: DeclarationId(466),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17978,7 +18012,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(465),
+            id: DeclarationId(467),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -17997,17 +18031,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(466),
+            id: DeclarationId(468),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(53),
                     },
                 ],
@@ -18023,7 +18057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23872, 23899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(467),
+            id: DeclarationId(469),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18037,7 +18071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/machine_constraints.dag", 7335, 7342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(468),
+            id: DeclarationId(470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18057,7 +18091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2277, 2295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(469),
+            id: DeclarationId(471),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18077,7 +18111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2323, 2343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(470),
+            id: DeclarationId(472),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18097,7 +18131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2371, 2391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(471),
+            id: DeclarationId(473),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18117,7 +18151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2419, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(472),
+            id: DeclarationId(474),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18137,7 +18171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2468, 2489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(473),
+            id: DeclarationId(475),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18157,7 +18191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2583, 2601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(474),
+            id: DeclarationId(476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18177,7 +18211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2631, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(475),
+            id: DeclarationId(477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18197,7 +18231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2681, 2701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(476),
+            id: DeclarationId(478),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18217,7 +18251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2731, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(477),
+            id: DeclarationId(479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18237,7 +18271,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 2782, 2803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(478),
+            id: DeclarationId(480),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(27),
@@ -18257,7 +18291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 6254, 6274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(479),
+            id: DeclarationId(481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18277,7 +18311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 7962, 7988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(480),
+            id: DeclarationId(482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -18297,11 +18331,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 8024, 8050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(481),
+            id: DeclarationId(483),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(76)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(2))),
             },
             type_params: vec![],
@@ -18315,7 +18349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/integer.dag", 9551, 9558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(482),
+            id: DeclarationId(484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(29),
@@ -18335,7 +18369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/rational.dag", 1267, 1288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(483),
+            id: DeclarationId(485),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18349,7 +18383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1052, 1065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(484),
+            id: DeclarationId(486),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18363,7 +18397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1070, 1076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(485),
+            id: DeclarationId(487),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18377,7 +18411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1081, 1099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(486),
+            id: DeclarationId(488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18391,7 +18425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1104, 1122),
         });
         declarations.push(Declaration {
-            id: DeclarationId(487),
+            id: DeclarationId(489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18405,7 +18439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1127, 1141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(488),
+            id: DeclarationId(490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18419,7 +18453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1423, 1432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(489),
+            id: DeclarationId(491),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -18444,7 +18478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1437, 1514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(490),
+            id: DeclarationId(492),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -18469,7 +18503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1519, 1589),
         });
         declarations.push(Declaration {
-            id: DeclarationId(491),
+            id: DeclarationId(493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18483,7 +18517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1829, 1834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(492),
+            id: DeclarationId(494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18497,7 +18531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1837, 1845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(493),
+            id: DeclarationId(495),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18511,7 +18545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1848, 1868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(494),
+            id: DeclarationId(496),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18525,7 +18559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2118, 2128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(495),
+            id: DeclarationId(497),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18539,7 +18573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2131, 2145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(496),
+            id: DeclarationId(498),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18553,7 +18587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2400, 2412),
         });
         declarations.push(Declaration {
-            id: DeclarationId(497),
+            id: DeclarationId(499),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18567,7 +18601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2415, 2425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(498),
+            id: DeclarationId(500),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18581,7 +18615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2743, 2755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(499),
+            id: DeclarationId(501),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18595,7 +18629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2758, 2774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(500),
+            id: DeclarationId(502),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18609,7 +18643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2777, 2788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(501),
+            id: DeclarationId(503),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(39),
@@ -18629,13 +18663,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 3433, 3441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(502),
+            id: DeclarationId(504),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(70),
+                template: DeclarationId(29),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(71),
-                    value: DeclarationId(8),
+                    parameter: DeclarationId(30),
+                    value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -18646,16 +18680,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1272, 1292),
+            span: SourceSpan::new("dsl/std/float.dag", 1475, 1496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(503),
+            id: DeclarationId(505),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(71),
-                    value: DeclarationId(9),
+                    value: DeclarationId(8),
                 }],
             },
             type_params: vec![],
@@ -18666,16 +18700,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1331, 1351),
+            span: SourceSpan::new("dsl/std/float.dag", 1747, 1767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(504),
+            id: DeclarationId(506),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(29),
+                template: DeclarationId(70),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(30),
-                    value: DeclarationId(93),
+                    parameter: DeclarationId(71),
+                    value: DeclarationId(9),
                 }],
             },
             type_params: vec![],
@@ -18686,10 +18720,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1601, 1622),
+            span: SourceSpan::new("dsl/std/float.dag", 1797, 1817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(505),
+            id: DeclarationId(507),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -18708,13 +18742,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(506),
+            id: DeclarationId(508),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -18728,11 +18762,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4054, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(507),
+            id: DeclarationId(509),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -18747,11 +18781,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(508),
+            id: DeclarationId(510),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -18766,13 +18800,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(509),
+            id: DeclarationId(511),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -18786,7 +18820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6508, 6520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(510),
+            id: DeclarationId(512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18800,7 +18834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 7586, 7590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(511),
+            id: DeclarationId(513),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18814,13 +18848,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 7593, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(512),
+            id: DeclarationId(514),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(152),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(154),
                 }],
             },
             type_params: vec![],
@@ -18834,13 +18868,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 12459, 12476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(513),
+            id: DeclarationId(515),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(153),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(155),
                 }],
             },
             type_params: vec![],
@@ -18854,7 +18888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 12510, 12527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(514),
+            id: DeclarationId(516),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18868,7 +18902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16688, 16693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(515),
+            id: DeclarationId(517),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18882,7 +18916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16696, 16701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(516),
+            id: DeclarationId(518),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18896,7 +18930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16704, 16711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(517),
+            id: DeclarationId(519),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18910,7 +18944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16863, 16867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(518),
+            id: DeclarationId(520),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18924,7 +18958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16870, 16879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(519),
+            id: DeclarationId(521),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18938,7 +18972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16882, 16888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(520),
+            id: DeclarationId(522),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18952,7 +18986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16891, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(521),
+            id: DeclarationId(523),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18966,7 +19000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16919, 16927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(522),
+            id: DeclarationId(524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18980,7 +19014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16930, 16939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(523),
+            id: DeclarationId(525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -18994,7 +19028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16942, 16948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(524),
+            id: DeclarationId(526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19008,7 +19042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16968, 16970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(525),
+            id: DeclarationId(527),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19022,7 +19056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16973, 16974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(526),
+            id: DeclarationId(528),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19036,7 +19070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16977, 16978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(527),
+            id: DeclarationId(529),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19050,7 +19084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16981, 16982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(528),
+            id: DeclarationId(530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19064,12 +19098,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16985, 16987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(529),
+            id: DeclarationId(531),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "secret_name".to_string(),
-                    ty: DeclarationId(149),
+                    ty: DeclarationId(151),
                 }],
             },
             type_params: vec![],
@@ -19083,12 +19117,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17259, 17294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(530),
+            id: DeclarationId(532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "env_var".to_string(),
-                    ty: DeclarationId(149),
+                    ty: DeclarationId(151),
                 }],
             },
             type_params: vec![],
@@ -19102,11 +19136,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17299, 17340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(531),
+            id: DeclarationId(533),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(178),
+                    DeclarationId(180),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -19121,13 +19155,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17415, 17435),
         });
         declarations.push(Declaration {
-            id: DeclarationId(532),
+            id: DeclarationId(534),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -19141,21 +19175,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17450, 17462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(533),
+            id: DeclarationId(535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "audience".to_string(),
-                        ty: DeclarationId(149),
+                        ty: DeclarationId(151),
                     },
                     Field {
                         label: "service_account".to_string(),
-                        ty: DeclarationId(531),
+                        ty: DeclarationId(533),
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(532),
+                        ty: DeclarationId(534),
                     },
                 ],
             },
@@ -19170,13 +19204,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17345, 17468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(534),
+            id: DeclarationId(536),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -19190,12 +19224,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17499, 17511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(535),
+            id: DeclarationId(537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "scopes".to_string(),
-                    ty: DeclarationId(534),
+                    ty: DeclarationId(536),
                 }],
             },
             type_params: vec![],
@@ -19209,13 +19243,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17473, 17513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(536),
+            id: DeclarationId(538),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(183),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(185),
                 }],
             },
             type_params: vec![],
@@ -19229,12 +19263,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17535, 17555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(537),
+            id: DeclarationId(539),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(536),
+                    ty: DeclarationId(538),
                 }],
             },
             type_params: vec![],
@@ -19248,7 +19282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17518, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(538),
+            id: DeclarationId(540),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19262,7 +19296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17644, 17650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(539),
+            id: DeclarationId(541),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19276,7 +19310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17653, 17656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(540),
+            id: DeclarationId(542),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19290,7 +19324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17659, 17666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(541),
+            id: DeclarationId(543),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19304,7 +19338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17669, 17672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(542),
+            id: DeclarationId(544),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19318,7 +19352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17675, 17680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(543),
+            id: DeclarationId(545),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19332,7 +19366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17683, 17687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(544),
+            id: DeclarationId(546),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19346,7 +19380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17690, 17696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(545),
+            id: DeclarationId(547),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19360,7 +19394,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17699, 17705),
         });
         declarations.push(Declaration {
-            id: DeclarationId(546),
+            id: DeclarationId(548),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19374,7 +19408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17708, 17716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(547),
+            id: DeclarationId(549),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19388,7 +19422,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17719, 17726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(548),
+            id: DeclarationId(550),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19402,7 +19436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17729, 17735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(549),
+            id: DeclarationId(551),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19416,7 +19450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17750, 17763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(550),
+            id: DeclarationId(552),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19430,7 +19464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17766, 17768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(551),
+            id: DeclarationId(553),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19444,7 +19478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17771, 17776),
         });
         declarations.push(Declaration {
-            id: DeclarationId(552),
+            id: DeclarationId(554),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19458,7 +19492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17779, 17782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(553),
+            id: DeclarationId(555),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19472,7 +19506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17793, 17798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(554),
+            id: DeclarationId(556),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19486,7 +19520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17801, 17806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(555),
+            id: DeclarationId(557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19500,7 +19534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17809, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(556),
+            id: DeclarationId(558),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19514,7 +19548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17819, 17826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(557),
+            id: DeclarationId(559),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19528,7 +19562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17829, 17836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(558),
+            id: DeclarationId(560),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19542,7 +19576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17839, 17842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(559),
+            id: DeclarationId(561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19556,7 +19590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17845, 17849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(560),
+            id: DeclarationId(562),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19570,7 +19604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17864, 17871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(561),
+            id: DeclarationId(563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19584,7 +19618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17874, 17877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(562),
+            id: DeclarationId(564),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19598,7 +19632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17880, 17887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(563),
+            id: DeclarationId(565),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19612,7 +19646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17890, 17899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(564),
+            id: DeclarationId(566),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19626,7 +19660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17902, 17906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(565),
+            id: DeclarationId(567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19640,7 +19674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17909, 17913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(566),
+            id: DeclarationId(568),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19654,7 +19688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17916, 17926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(567),
+            id: DeclarationId(569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19668,7 +19702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17929, 17933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(568),
+            id: DeclarationId(570),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19682,7 +19716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17936, 17942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(569),
+            id: DeclarationId(571),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19696,7 +19730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17963, 17969),
         });
         declarations.push(Declaration {
-            id: DeclarationId(570),
+            id: DeclarationId(572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19710,7 +19744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17972, 17975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(571),
+            id: DeclarationId(573),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19724,7 +19758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17978, 17987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(572),
+            id: DeclarationId(574),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19738,7 +19772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17990, 17992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(573),
+            id: DeclarationId(575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19752,11 +19786,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17995, 18003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(574),
+            id: DeclarationId(576),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(187),
+                    DeclarationId(189),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -19771,7 +19805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18071, 18078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(575),
+            id: DeclarationId(577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19785,7 +19819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18475, 18486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(576),
+            id: DeclarationId(578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19799,7 +19833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18491, 18500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(577),
+            id: DeclarationId(579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19813,7 +19847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18505, 18512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(578),
+            id: DeclarationId(580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19827,7 +19861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18517, 18524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(579),
+            id: DeclarationId(581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19841,7 +19875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18529, 18534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(580),
+            id: DeclarationId(582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19855,7 +19889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18687, 18697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(581),
+            id: DeclarationId(583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19869,7 +19903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18702, 18711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(582),
+            id: DeclarationId(584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19883,7 +19917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 18716, 18722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(583),
+            id: DeclarationId(585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19897,7 +19931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21025, 21028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(584),
+            id: DeclarationId(586),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19911,7 +19945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21031, 21035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(585),
+            id: DeclarationId(587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19925,7 +19959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21038, 21041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(586),
+            id: DeclarationId(588),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19939,7 +19973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21044, 21049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(587),
+            id: DeclarationId(589),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19953,7 +19987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21052, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(588),
+            id: DeclarationId(590),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19967,7 +20001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21061, 21065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(589),
+            id: DeclarationId(591),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19981,7 +20015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21068, 21075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(590),
+            id: DeclarationId(592),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -19995,12 +20029,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21563, 21569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(591),
+            id: DeclarationId(593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20014,12 +20048,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21574, 21597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(592),
+            id: DeclarationId(594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "username".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20033,7 +20067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21602, 21628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(593),
+            id: DeclarationId(595),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20047,11 +20081,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21633, 21639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(594),
+            id: DeclarationId(596),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(158),
+                    DeclarationId(160),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20066,11 +20100,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21831, 21841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(595),
+            id: DeclarationId(597),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20085,13 +20119,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21966, 21973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(596),
+            id: DeclarationId(598),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20105,7 +20139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22013, 22025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(597),
+            id: DeclarationId(599),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -20124,13 +20158,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22040, 22044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(598),
+            id: DeclarationId(600),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(211),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(213),
                 }],
             },
             type_params: vec![],
@@ -20144,13 +20178,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23395, 23413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(599),
+            id: DeclarationId(601),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(212),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(214),
                 }],
             },
             type_params: vec![],
@@ -20164,11 +20198,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23506, 23527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(600),
+            id: DeclarationId(602),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20183,13 +20217,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23811, 23818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(601),
+            id: DeclarationId(603),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(216),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(218),
                 }],
             },
             type_params: vec![],
@@ -20203,13 +20237,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23851, 23866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(602),
+            id: DeclarationId(604),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(219),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(221),
                 }],
             },
             type_params: vec![],
@@ -20223,13 +20257,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24155, 24173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(603),
+            id: DeclarationId(605),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(220),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(222),
                 }],
             },
             type_params: vec![],
@@ -20243,13 +20277,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24183, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(604),
+            id: DeclarationId(606),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20263,11 +20297,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24223, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(605),
+            id: DeclarationId(607),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20282,11 +20316,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24323, 24330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(606),
+            id: DeclarationId(608),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20301,13 +20335,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24417, 24424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(607),
+            id: DeclarationId(609),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20321,13 +20355,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24452, 24464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(608),
+            id: DeclarationId(610),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20341,13 +20375,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24476, 24488),
         });
         declarations.push(Declaration {
-            id: DeclarationId(609),
+            id: DeclarationId(611),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -20361,11 +20395,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24500, 24512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(610),
+            id: DeclarationId(612),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(223),
+                    DeclarationId(225),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20380,11 +20414,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24647, 24662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(611),
+            id: DeclarationId(613),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(189),
+                    DeclarationId(191),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20399,11 +20433,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24673, 24686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(612),
+            id: DeclarationId(614),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(188),
+                    DeclarationId(190),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20418,7 +20452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24702, 24715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(613),
+            id: DeclarationId(615),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20432,7 +20466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24741, 24745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(614),
+            id: DeclarationId(616),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20446,7 +20480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24748, 24750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(615),
+            id: DeclarationId(617),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20460,7 +20494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24753, 24754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(616),
+            id: DeclarationId(618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20474,11 +20508,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24757, 24761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(617),
+            id: DeclarationId(619),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -20493,18 +20527,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24825, 24832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(618),
+            id: DeclarationId(620),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
@@ -20519,17 +20553,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3063, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(619),
+            id: DeclarationId(621),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(93),
                     },
                 ],
@@ -20545,18 +20579,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3533, 3549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(620),
+            id: DeclarationId(622),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
@@ -20571,18 +20605,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4740, 4757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(621),
+            id: DeclarationId(623),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
                     },
                 ],
             },
@@ -20597,11 +20631,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 5722, 5741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(622),
+            id: DeclarationId(624),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(8))),
             },
             type_params: vec![],
@@ -20615,11 +20649,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 10914, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(623),
+            id: DeclarationId(625),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(14))),
             },
             type_params: vec![],
@@ -20633,11 +20667,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 10966, 10991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(624),
+            id: DeclarationId(626),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(20))),
             },
             type_params: vec![],
@@ -20651,7 +20685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11122, 11147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(625),
+            id: DeclarationId(627),
             name: Some("<registered predicate not lowered: SecretValue>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20665,7 +20699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11305, 11347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(626),
+            id: DeclarationId(628),
             name: Some("<registered predicate not lowered: NonEmptyStr>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20679,7 +20713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11534, 11579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(627),
+            id: DeclarationId(629),
             name: Some("<registered predicate not lowered: LanguageId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20693,7 +20727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11580, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(628),
+            id: DeclarationId(630),
             name: Some("<registered predicate not lowered: SecretName>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20707,7 +20741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 11626, 11671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(629),
+            id: DeclarationId(631),
             name: Some("<registered predicate not lowered: PathSegment>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20721,7 +20755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 12306, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(630),
+            id: DeclarationId(632),
             name: Some("<registered predicate not lowered: GlobSegment>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20735,7 +20769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 12366, 12425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(631),
+            id: DeclarationId(633),
             name: Some("<registered predicate not lowered: FilePath>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20749,11 +20783,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 12530, 12573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(632),
+            id: DeclarationId(634),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(23))),
             },
             type_params: vec![],
@@ -20767,11 +20801,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 13409, 13422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(633),
+            id: DeclarationId(635),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(26))),
             },
             type_params: vec![],
@@ -20785,11 +20819,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 13454, 13467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(634),
+            id: DeclarationId(636),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(29))),
             },
             type_params: vec![],
@@ -20803,11 +20837,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 13980, 13993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(635),
+            id: DeclarationId(637),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(32))),
             },
             type_params: vec![],
@@ -20821,7 +20855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14025, 14038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(636),
+            id: DeclarationId(638),
             name: Some("<registered predicate not lowered: IntentId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20835,7 +20869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14562, 14617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(637),
+            id: DeclarationId(639),
             name: Some("<registered predicate not lowered: IssueId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20849,7 +20883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14618, 14672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(638),
+            id: DeclarationId(640),
             name: Some("<registered predicate not lowered: RunKey>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20863,7 +20897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14673, 14726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(639),
+            id: DeclarationId(641),
             name: Some("<registered predicate not lowered: ArtifactId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20877,7 +20911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14727, 14784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(640),
+            id: DeclarationId(642),
             name: Some("<registered predicate not lowered: LeaseToken>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20891,7 +20925,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14785, 14842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(641),
+            id: DeclarationId(643),
             name: Some("<registered predicate not lowered: WorkerId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20905,7 +20939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14843, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(642),
+            id: DeclarationId(644),
             name: Some("<registered predicate not lowered: CommentId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20919,7 +20953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14899, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(643),
+            id: DeclarationId(645),
             name: Some("<registered predicate not lowered: SignalKey>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20933,7 +20967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 14956, 15012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(644),
+            id: DeclarationId(646),
             name: Some("<registered predicate not lowered: ContentHash>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20947,7 +20981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 15013, 15071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(645),
+            id: DeclarationId(647),
             name: Some("<registered predicate not lowered: WorkflowProducerId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20961,7 +20995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 15302, 15373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(646),
+            id: DeclarationId(648),
             name: Some("<registered predicate not lowered: WorkflowObserverId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20975,7 +21009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 15374, 15445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(647),
+            id: DeclarationId(649),
             name: Some("<registered predicate not lowered: WorkflowProverId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -20989,7 +21023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 15446, 15513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(648),
+            id: DeclarationId(650),
             name: Some("<registered predicate not lowered: WorkflowRunId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21003,7 +21037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 15514, 15575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(649),
+            id: DeclarationId(651),
             name: Some("<registered predicate not lowered: GitRef>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21017,7 +21051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 15655, 15697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(650),
+            id: DeclarationId(652),
             name: Some("<registered predicate not lowered: GcpProjectId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21031,7 +21065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16082, 16124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(651),
+            id: DeclarationId(653),
             name: Some("<registered predicate not lowered: FilesystemHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21045,7 +21079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22123, 22187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(652),
+            id: DeclarationId(654),
             name: Some("<registered predicate not lowered: NetworkHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21059,7 +21093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22188, 22245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(653),
+            id: DeclarationId(655),
             name: Some("<registered predicate not lowered: ToolHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21073,7 +21107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 22246, 22302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(654),
+            id: DeclarationId(656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21087,7 +21121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 3679, 3689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(655),
+            id: DeclarationId(657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21101,7 +21135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 3692, 3697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(656),
+            id: DeclarationId(658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21115,7 +21149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 3700, 3710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(657),
+            id: DeclarationId(659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21129,7 +21163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 3713, 3726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(658),
+            id: DeclarationId(660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21143,7 +21177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 4762, 4771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(659),
+            id: DeclarationId(661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21157,7 +21191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 4774, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(660),
+            id: DeclarationId(662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21171,13 +21205,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 4783, 4787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(661),
+            id: DeclarationId(663),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
@@ -21191,12 +21225,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 5335, 5353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(662),
+            id: DeclarationId(664),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(93),
                 }],
             },
@@ -21211,13 +21245,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 6155, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(663),
+            id: DeclarationId(665),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
@@ -21231,13 +21265,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/unicode.dag", 6404, 6422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(664),
+            id: DeclarationId(666),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(45),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(46),
-                    value: DeclarationId(126),
+                    value: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -21251,21 +21285,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 7574, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(665),
+            id: DeclarationId(667),
             name: Some("List".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1668),
+                        ty: DeclarationId(1670),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1670),
+                        ty: DeclarationId(1672),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(666)],
+            type_params: vec![DeclarationId(668)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21276,7 +21310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2083, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(666),
+            id: DeclarationId(668),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21290,14 +21324,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2083, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(667),
+            id: DeclarationId(669),
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1638),
+                output: DeclarationId(1640),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
-            type_params: vec![DeclarationId(668)],
+            type_params: vec![DeclarationId(670)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21308,7 +21342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3236, 3284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(668),
+            id: DeclarationId(670),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21322,14 +21356,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3236, 3284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(669),
+            id: DeclarationId(671),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(670), DeclarationId(1639)],
-                output: DeclarationId(1640),
+                inputs: vec![DeclarationId(672), DeclarationId(1641)],
+                output: DeclarationId(1642),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
-            type_params: vec![DeclarationId(670)],
+            type_params: vec![DeclarationId(672)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21340,7 +21374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3383, 3475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(670),
+            id: DeclarationId(672),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21354,14 +21388,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3383, 3475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(671),
+            id: DeclarationId(673),
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(672)],
-                output: DeclarationId(1641),
+                inputs: vec![DeclarationId(674)],
+                output: DeclarationId(1643),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
-            type_params: vec![DeclarationId(672)],
+            type_params: vec![DeclarationId(674)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21372,7 +21406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3519, 3590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(672),
+            id: DeclarationId(674),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21386,14 +21420,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3519, 3590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(673),
+            id: DeclarationId(675),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1642), DeclarationId(675), DeclarationId(1643)],
-                output: DeclarationId(675),
+                inputs: vec![DeclarationId(1644), DeclarationId(677), DeclarationId(1645)],
+                output: DeclarationId(677),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
-            type_params: vec![DeclarationId(674), DeclarationId(675)],
+            type_params: vec![DeclarationId(676), DeclarationId(677)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21404,7 +21438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(674),
+            id: DeclarationId(676),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21418,7 +21452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(675),
+            id: DeclarationId(677),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("U".to_string())),
             type_params: vec![],
@@ -21432,14 +21466,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(676),
+            id: DeclarationId(678),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1644), DeclarationId(678), DeclarationId(1645)],
-                output: DeclarationId(678),
+                inputs: vec![DeclarationId(1646), DeclarationId(680), DeclarationId(1647)],
+                output: DeclarationId(680),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
-            type_params: vec![DeclarationId(677), DeclarationId(678)],
+            type_params: vec![DeclarationId(679), DeclarationId(680)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21450,7 +21484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(677),
+            id: DeclarationId(679),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21464,7 +21498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(678),
+            id: DeclarationId(680),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("U".to_string())),
             type_params: vec![],
@@ -21478,14 +21512,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(679),
+            id: DeclarationId(681),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1646), DeclarationId(1647)],
-                output: DeclarationId(1648),
+                inputs: vec![DeclarationId(1648), DeclarationId(1649)],
+                output: DeclarationId(1650),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
-            type_params: vec![DeclarationId(680)],
+            type_params: vec![DeclarationId(682)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21496,7 +21530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5314, 5414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(680),
+            id: DeclarationId(682),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21510,14 +21544,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5314, 5414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(681),
+            id: DeclarationId(683),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1649), DeclarationId(1650)],
-                output: DeclarationId(1651),
+                inputs: vec![DeclarationId(1651), DeclarationId(1652)],
+                output: DeclarationId(1653),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
-            type_params: vec![DeclarationId(682), DeclarationId(683)],
+            type_params: vec![DeclarationId(684), DeclarationId(685)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21528,7 +21562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(682),
+            id: DeclarationId(684),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("A".to_string())),
             type_params: vec![],
@@ -21542,7 +21576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(683),
+            id: DeclarationId(685),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("B".to_string())),
             type_params: vec![],
@@ -21556,14 +21590,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(684),
+            id: DeclarationId(686),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1652), DeclarationId(1653)],
-                output: DeclarationId(1654),
+                inputs: vec![DeclarationId(1654), DeclarationId(1655)],
+                output: DeclarationId(1656),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
-            type_params: vec![DeclarationId(685)],
+            type_params: vec![DeclarationId(687)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21574,7 +21608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5848, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(685),
+            id: DeclarationId(687),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21588,14 +21622,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5848, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(686),
+            id: DeclarationId(688),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1655), DeclarationId(1657)],
-                output: DeclarationId(1658),
+                inputs: vec![DeclarationId(1657), DeclarationId(1659)],
+                output: DeclarationId(1660),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
-            type_params: vec![DeclarationId(687), DeclarationId(688)],
+            type_params: vec![DeclarationId(689), DeclarationId(690)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21606,7 +21640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(687),
+            id: DeclarationId(689),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("A".to_string())),
             type_params: vec![],
@@ -21620,7 +21654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(688),
+            id: DeclarationId(690),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("B".to_string())),
             type_params: vec![],
@@ -21634,14 +21668,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(689),
+            id: DeclarationId(691),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1659)],
+                inputs: vec![DeclarationId(1661)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
-            type_params: vec![DeclarationId(690)],
+            type_params: vec![DeclarationId(692)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21652,7 +21686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6337, 6409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(690),
+            id: DeclarationId(692),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21666,14 +21700,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6337, 6409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(691),
+            id: DeclarationId(693),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1660)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1662)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
-            type_params: vec![DeclarationId(692)],
+            type_params: vec![DeclarationId(694)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21684,7 +21718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6567, 6671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(692),
+            id: DeclarationId(694),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21698,7 +21732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6567, 6671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(693),
+            id: DeclarationId(695),
             name: Some("IndexedElement".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -21708,11 +21742,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(694),
+                        ty: DeclarationId(696),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(694)],
+            type_params: vec![DeclarationId(696)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21723,7 +21757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6993, 7055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(694),
+            id: DeclarationId(696),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21737,14 +21771,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6993, 7055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(695),
+            id: DeclarationId(697),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1661)],
-                output: DeclarationId(1663),
+                inputs: vec![DeclarationId(1663)],
+                output: DeclarationId(1665),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
-            type_params: vec![DeclarationId(696)],
+            type_params: vec![DeclarationId(698)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21755,7 +21789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7180, 7269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(696),
+            id: DeclarationId(698),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21769,14 +21803,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7180, 7269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(697),
+            id: DeclarationId(699),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1664), DeclarationId(93)],
-                output: DeclarationId(1666),
+                inputs: vec![DeclarationId(1666), DeclarationId(93)],
+                output: DeclarationId(1668),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
-            type_params: vec![DeclarationId(698)],
+            type_params: vec![DeclarationId(700)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21787,7 +21821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7386, 7644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(698),
+            id: DeclarationId(700),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21801,14 +21835,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7386, 7644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(699),
+            id: DeclarationId(701),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1667), DeclarationId(700)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1669), DeclarationId(702)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
-            type_params: vec![DeclarationId(700)],
+            type_params: vec![DeclarationId(702)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21819,7 +21853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 8156, 8332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(700),
+            id: DeclarationId(702),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -21833,7 +21867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 8156, 8332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(701),
+            id: DeclarationId(703),
             name: Some("NodeId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21847,7 +21881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1364, 1375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(702),
+            id: DeclarationId(704),
             name: Some("PortId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21861,7 +21895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1376, 1387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(703),
+            id: DeclarationId(705),
             name: Some("DeclarationId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21875,7 +21909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1388, 1406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(704),
+            id: DeclarationId(706),
             name: Some("ClusterId".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -21889,21 +21923,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1407, 1421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(705),
+            id: DeclarationId(707),
             name: Some("NonEmptyList".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "first".to_string(),
-                        ty: DeclarationId(706),
+                        ty: DeclarationId(708),
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1671),
+                        ty: DeclarationId(1673),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(706)],
+            type_params: vec![DeclarationId(708)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21914,7 +21948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1423, 1492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(706),
+            id: DeclarationId(708),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21928,25 +21962,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1423, 1492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(707),
+            id: DeclarationId(709),
             name: Some("NonSingletonList".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "first".to_string(),
-                        ty: DeclarationId(708),
+                        ty: DeclarationId(710),
                     },
                     Field {
                         label: "second".to_string(),
-                        ty: DeclarationId(708),
+                        ty: DeclarationId(710),
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1672),
+                        ty: DeclarationId(1674),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(708)],
+            type_params: vec![DeclarationId(710)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -21957,7 +21991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1494, 1585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(708),
+            id: DeclarationId(710),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -21971,17 +22005,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1494, 1585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(709),
+            id: DeclarationId(711),
             name: Some("UrlPathToken".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1687),
+                        ty: DeclarationId(1689),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1688),
+                        ty: DeclarationId(1690),
                     },
                 ],
             },
@@ -21996,12 +22030,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7510, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(710),
+            id: DeclarationId(712),
             name: Some("PathTemplate".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1689),
+                    ty: DeclarationId(1691),
                 }],
             },
             type_params: vec![],
@@ -22015,17 +22049,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7597, 7647),
         });
         declarations.push(Declaration {
-            id: DeclarationId(711),
+            id: DeclarationId(713),
             name: Some("PathSegmentTokensResult".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1691),
+                        ty: DeclarationId(1693),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1692),
+                        ty: DeclarationId(1694),
                     },
                 ],
             },
@@ -22040,17 +22074,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8003, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(712),
+            id: DeclarationId(714),
             name: Some("PathTemplateParseResult".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1693),
+                        ty: DeclarationId(1695),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1694),
+                        ty: DeclarationId(1696),
                     },
                 ],
             },
@@ -22065,11 +22099,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8477, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(713),
+            id: DeclarationId(715),
             name: Some("parse_path_template".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(712),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(714),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 8695, 10000)),
             },
             type_params: vec![],
@@ -22083,11 +22117,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8632, 10000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(714),
+            id: DeclarationId(716),
             name: Some("parse_segment_tokens".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(711),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(713),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 10066, 11705)),
             },
             type_params: vec![],
@@ -22101,11 +22135,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 10002, 11705),
         });
         declarations.push(Declaration {
-            id: DeclarationId(715),
+            id: DeclarationId(717),
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(710)],
-                output: DeclarationId(1673),
+                inputs: vec![DeclarationId(712)],
+                output: DeclarationId(1675),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -22119,21 +22153,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 11707, 12044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(716),
+            id: DeclarationId(718),
             name: Some("IdempotentShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1695),
+                        ty: DeclarationId(1697),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1696),
+                        ty: DeclarationId(1698),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1697),
+                        ty: DeclarationId(1699),
                     },
                 ],
             },
@@ -22148,17 +22182,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14330, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(717),
+            id: DeclarationId(719),
             name: Some("BreakingShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1698),
+                        ty: DeclarationId(1700),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1699),
+                        ty: DeclarationId(1701),
                     },
                 ],
             },
@@ -22173,17 +22207,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14674, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(718),
+            id: DeclarationId(720),
             name: Some("EffectShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1700),
+                        ty: DeclarationId(1702),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1701),
+                        ty: DeclarationId(1703),
                     },
                 ],
             },
@@ -22198,17 +22232,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15150, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(719),
+            id: DeclarationId(721),
             name: Some("CreateCause".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1702),
+                        ty: DeclarationId(1704),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1703),
+                        ty: DeclarationId(1705),
                     },
                 ],
             },
@@ -22223,21 +22257,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15722, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(720),
+            id: DeclarationId(722),
             name: Some("KeySource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1704),
+                        ty: DeclarationId(1706),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1705),
+                        ty: DeclarationId(1707),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1707),
+                        ty: DeclarationId(1709),
                     },
                 ],
             },
@@ -22252,21 +22286,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16482, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(721),
+            id: DeclarationId(723),
             name: Some("IdempotencyEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1708),
+                        ty: DeclarationId(1710),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1709),
+                        ty: DeclarationId(1711),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1710),
+                        ty: DeclarationId(1712),
                     },
                 ],
             },
@@ -22281,11 +22315,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17251, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(722),
+            id: DeclarationId(724),
             name: Some("is_idempotent_effect".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(718)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(720)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
             },
             type_params: vec![],
@@ -22299,11 +22333,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17524, 17648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(723),
+            id: DeclarationId(725),
             name: Some("derive_idempotency_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(718)],
-                output: DeclarationId(721),
+                inputs: vec![DeclarationId(720)],
+                output: DeclarationId(723),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
             },
             type_params: vec![],
@@ -22317,17 +22351,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17787, 18381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(724),
+            id: DeclarationId(726),
             name: Some("OperationEffect".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(718),
+                        ty: DeclarationId(720),
                     },
                 ],
             },
@@ -22342,21 +22376,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19065, 19135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(725),
+            id: DeclarationId(727),
             name: Some("DeriveOpEffectResult".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1711),
+                        ty: DeclarationId(1713),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1712),
+                        ty: DeclarationId(1714),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1715),
                     },
                 ],
             },
@@ -22371,17 +22405,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19489, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(726),
+            id: DeclarationId(728),
             name: Some("CompositionVerdict".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1714),
+                        ty: DeclarationId(1716),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1716),
+                        ty: DeclarationId(1718),
                     },
                 ],
             },
@@ -22396,11 +22430,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20510, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(727),
+            id: DeclarationId(729),
             name: Some("operation_is_breaking".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(724)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(726)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
             },
             type_params: vec![],
@@ -22414,11 +22448,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884),
         });
         declarations.push(Declaration {
-            id: DeclarationId(728),
+            id: DeclarationId(730),
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1674),
+                output: DeclarationId(1676),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -22432,11 +22466,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(729),
+            id: DeclarationId(731),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1675)],
-                output: DeclarationId(1677),
+                inputs: vec![DeclarationId(1677)],
+                output: DeclarationId(1679),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -22450,11 +22484,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(730),
+            id: DeclarationId(732),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1678)],
-                output: DeclarationId(1680),
+                inputs: vec![DeclarationId(1680)],
+                output: DeclarationId(1682),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -22468,11 +22502,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(731),
+            id: DeclarationId(733),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1681)],
-                output: DeclarationId(726),
+                inputs: vec![DeclarationId(1683)],
+                output: DeclarationId(728),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
             type_params: vec![],
@@ -22486,12 +22520,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 22240, 22436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(732),
+            id: DeclarationId(734),
             name: Some("BoolPortRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "port".to_string(),
-                    ty: DeclarationId(702),
+                    ty: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -22505,17 +22539,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 23637, 23672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(733),
+            id: DeclarationId(735),
             name: Some("BranchArm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "condition".to_string(),
-                        ty: DeclarationId(732),
+                        ty: DeclarationId(734),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(734),
+                        ty: DeclarationId(736),
                     },
                 ],
             },
@@ -22530,25 +22564,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 23757, 23823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(734),
+            id: DeclarationId(736),
             name: Some("WorkflowEffect".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1718),
+                        ty: DeclarationId(1720),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1720),
+                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1721),
+                        ty: DeclarationId(1723),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1725),
                     },
                 ],
             },
@@ -22563,21 +22597,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24499, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(735),
+            id: DeclarationId(737),
             name: Some("IdempotencyUnsupportedDetail".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "variant_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "downstream_stage".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -22592,17 +22626,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25086, 25190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(736),
+            id: DeclarationId(738),
             name: Some("WorkflowIdempotencyReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1727),
                     },
                 ],
             },
@@ -22617,11 +22651,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25329, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(737),
+            id: DeclarationId(739),
             name: Some("report_unsupported_workflow_variant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228), DeclarationId(228)],
-                output: DeclarationId(736),
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
             },
             type_params: vec![],
@@ -22635,29 +22669,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25469, 25765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(738),
+            id: DeclarationId(740),
             name: Some("ParallelismUnsupportedKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1726),
+                        ty: DeclarationId(1728),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1727),
+                        ty: DeclarationId(1729),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1730),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1731),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1730),
+                        ty: DeclarationId(1732),
                     },
                 ],
             },
@@ -22672,21 +22706,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25928, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(739),
+            id: DeclarationId(741),
             name: Some("ParallelismUnsupportedDetail".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(738),
+                        ty: DeclarationId(740),
                     },
                     Field {
                         label: "downstream_stage".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -22701,17 +22735,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26086, 26202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(740),
+            id: DeclarationId(742),
             name: Some("WorkflowParallelismReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1731),
+                        ty: DeclarationId(1733),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1732),
+                        ty: DeclarationId(1734),
                     },
                 ],
             },
@@ -22726,11 +22760,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26366, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(741),
+            id: DeclarationId(743),
             name: Some("report_parallelism_unsupported".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(738), DeclarationId(228)],
-                output: DeclarationId(740),
+                inputs: vec![DeclarationId(740), DeclarationId(230)],
+                output: DeclarationId(742),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
             },
             type_params: vec![],
@@ -22744,11 +22778,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26506, 26780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(742),
+            id: DeclarationId(744),
             name: Some("lane2_workflow_idempotency_report".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(734)],
-                output: DeclarationId(736),
+                inputs: vec![DeclarationId(736)],
+                output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
             },
             type_params: vec![],
@@ -22762,11 +22796,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(743),
+            id: DeclarationId(745),
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1682),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1684),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -22780,11 +22814,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29658, 30005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(744),
+            id: DeclarationId(746),
             name: Some("keyless_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(196)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(198)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
             },
             type_params: vec![],
@@ -22798,11 +22832,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(745),
+            id: DeclarationId(747),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1683), DeclarationId(196)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(1685), DeclarationId(198)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
             type_params: vec![],
@@ -22816,11 +22850,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(746),
+            id: DeclarationId(748),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1684), DeclarationId(196)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(1686), DeclarationId(198)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
             type_params: vec![],
@@ -22834,11 +22868,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30630, 30858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(747),
+            id: DeclarationId(749),
             name: Some("derive_effect_shape".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(196), DeclarationId(710)],
-                output: DeclarationId(718),
+                inputs: vec![DeclarationId(198), DeclarationId(712)],
+                output: DeclarationId(720),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
             },
             type_params: vec![],
@@ -22852,11 +22886,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30860, 31429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(748),
+            id: DeclarationId(750),
             name: Some("derive_op_effect".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(196), DeclarationId(710)],
-                output: DeclarationId(725),
+                inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(712)],
+                output: DeclarationId(727),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
             },
             type_params: vec![],
@@ -22870,21 +22904,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 31431, 31731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(749),
+            id: DeclarationId(751),
             name: Some("ModifierAgreement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1733),
+                        ty: DeclarationId(1735),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1734),
+                        ty: DeclarationId(1736),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1735),
+                        ty: DeclarationId(1737),
                     },
                 ],
             },
@@ -22899,17 +22933,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32431, 32548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(750),
+            id: DeclarationId(752),
             name: Some("ModifierAxisCheck".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1736),
+                        ty: DeclarationId(1738),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1737),
+                        ty: DeclarationId(1739),
                     },
                 ],
             },
@@ -22924,25 +22958,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32995, 33095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(751),
+            id: DeclarationId(753),
             name: Some("ModifierCheck".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "derived_shape".to_string(),
-                        ty: DeclarationId(718),
+                        ty: DeclarationId(720),
                     },
                     Field {
                         label: "idempotent_check".to_string(),
-                        ty: DeclarationId(750),
+                        ty: DeclarationId(752),
                     },
                     Field {
                         label: "readonly_check".to_string(),
-                        ty: DeclarationId(750),
+                        ty: DeclarationId(752),
                     },
                 ],
             },
@@ -22957,11 +22991,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33097, 33247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(752),
+            id: DeclarationId(754),
             name: Some("classify_idempotent_disagreement".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(717)],
-                output: DeclarationId(749),
+                inputs: vec![DeclarationId(719)],
+                output: DeclarationId(751),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
             },
             type_params: vec![],
@@ -22975,11 +23009,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33807, 34428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(753),
+            id: DeclarationId(755),
             name: Some("classify_readonly_agreement".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(718)],
-                output: DeclarationId(749),
+                inputs: vec![DeclarationId(720)],
+                output: DeclarationId(751),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
             },
             type_params: vec![],
@@ -22993,11 +23027,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 34760, 35274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(754),
+            id: DeclarationId(756),
             name: Some("check_modifier_vs_derivation".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(724), DeclarationId(126), DeclarationId(126)],
-                output: DeclarationId(751),
+                inputs: vec![DeclarationId(726), DeclarationId(128), DeclarationId(128)],
+                output: DeclarationId(753),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
             },
             type_params: vec![],
@@ -23011,25 +23045,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 35276, 36055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(755),
+            id: DeclarationId(757),
             name: Some("IdempotencyTestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "effect_shape".to_string(),
-                        ty: DeclarationId(718),
+                        ty: DeclarationId(720),
                     },
                     Field {
                         label: "claim".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "witness_required".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -23044,11 +23078,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(756),
+            id: DeclarationId(758),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1685)],
-                output: DeclarationId(1686),
+                inputs: vec![DeclarationId(1687)],
+                output: DeclarationId(1688),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
             },
             type_params: vec![],
@@ -23062,21 +23096,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36537, 36910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(757),
+            id: DeclarationId(759),
             name: Some("WorkflowEffectConcern".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "workflow_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "create_op".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -23091,12 +23125,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 37227, 37318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(758),
+            id: DeclarationId(760),
             name: Some("TypeShape".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "declaration".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -23110,21 +23144,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 270, 317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(759),
+            id: DeclarationId(761),
             name: Some("PortState".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1748),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1749),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1748),
+                        ty: DeclarationId(1750),
                     },
                 ],
             },
@@ -23139,21 +23173,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 460, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(760),
+            id: DeclarationId(762),
             name: Some("DagPort".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(759),
+                        ty: DeclarationId(761),
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1749),
+                        ty: DeclarationId(1751),
                     },
                 ],
             },
@@ -23168,21 +23202,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 530, 601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(761),
+            id: DeclarationId(763),
             name: Some("LiteralBits".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1752),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1753),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1754),
                     },
                 ],
             },
@@ -23197,29 +23231,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1083, 1158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(762),
+            id: DeclarationId(764),
             name: Some("AtomPayload".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1753),
+                        ty: DeclarationId(1755),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1754),
+                        ty: DeclarationId(1756),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1755),
+                        ty: DeclarationId(1757),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1758),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1759),
                     },
                 ],
             },
@@ -23234,21 +23268,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3270, 3439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(763),
+            id: DeclarationId(765),
             name: Some("PositiveIntervalWidth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1760),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1759),
+                        ty: DeclarationId(1761),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1762),
                     },
                 ],
             },
@@ -23263,17 +23297,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4032, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(764),
+            id: DeclarationId(766),
             name: Some("IntervalWidth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1763),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1764),
                     },
                 ],
             },
@@ -23288,21 +23322,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5715, 5788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(765),
+            id: DeclarationId(767),
             name: Some("Interval".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1765),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1766),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(766)],
+            type_params: vec![DeclarationId(768)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23313,7 +23347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6079, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(766),
+            id: DeclarationId(768),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("D".to_string())),
             type_params: vec![],
@@ -23327,12 +23361,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6079, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(767),
+            id: DeclarationId(769),
             name: Some("IntInterval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(765),
+                template: DeclarationId(767),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(766),
+                    parameter: DeclarationId(768),
                     value: DeclarationId(93),
                 }],
             },
@@ -23347,17 +23381,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6314, 6346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(768),
+            id: DeclarationId(770),
             name: Some("BoundDeclaration".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1768),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1769),
                     },
                 ],
             },
@@ -23372,21 +23406,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6702, 6776),
         });
         declarations.push(Declaration {
-            id: DeclarationId(769),
+            id: DeclarationId(771),
             name: Some("CardinalityBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1770),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1771),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1770),
+                        ty: DeclarationId(1772),
                     },
                 ],
             },
@@ -23401,17 +23435,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7001, 7065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(770),
+            id: DeclarationId(772),
             name: Some("ConjField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                 ],
             },
@@ -23426,17 +23460,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7067, 7121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(771),
+            id: DeclarationId(773),
             name: Some("TemplateArgument".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "parameter".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                 ],
             },
@@ -23451,17 +23485,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7123, 7198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(772),
+            id: DeclarationId(774),
             name: Some("FieldEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(773),
+                        ty: DeclarationId(775),
                     },
                 ],
             },
@@ -23476,33 +23510,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7200, 7255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(773),
+            id: DeclarationId(775),
             name: Some("FieldValue".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1773),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1774),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1774),
+                        ty: DeclarationId(1776),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1776),
+                        ty: DeclarationId(1778),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1778),
+                        ty: DeclarationId(1780),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1780),
+                        ty: DeclarationId(1782),
                     },
                 ],
             },
@@ -23517,29 +23551,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7472, 7708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(774),
+            id: DeclarationId(776),
             name: Some("ValueBody".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1781),
+                        ty: DeclarationId(1783),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1783),
+                        ty: DeclarationId(1785),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1786),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1788),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1788),
+                        ty: DeclarationId(1790),
                     },
                 ],
             },
@@ -23554,12 +23588,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9302, 9507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(775),
+            id: DeclarationId(777),
             name: Some("BindNodeId".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "node".to_string(),
-                    ty: DeclarationId(701),
+                    ty: DeclarationId(703),
                 }],
             },
             type_params: vec![],
@@ -23573,29 +23607,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10411, 10445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(776),
+            id: DeclarationId(778),
             name: Some("ArrowBody".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1789),
+                        ty: DeclarationId(1791),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1790),
+                        ty: DeclarationId(1792),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1791),
+                        ty: DeclarationId(1793),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1792),
+                        ty: DeclarationId(1794),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1793),
+                        ty: DeclarationId(1795),
                     },
                 ],
             },
@@ -23610,33 +23644,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10742, 10871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(777),
+            id: DeclarationId(779),
             name: Some("TypeConnective".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1796),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1798),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1800),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1800),
+                        ty: DeclarationId(1802),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1801),
+                        ty: DeclarationId(1803),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1803),
+                        ty: DeclarationId(1805),
                     },
                 ],
             },
@@ -23651,49 +23685,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11076, 11476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(778),
+            id: DeclarationId(780),
             name: Some("Declaration".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1804),
+                        ty: DeclarationId(1806),
                     },
                     Field {
                         label: "connective".to_string(),
-                        ty: DeclarationId(777),
+                        ty: DeclarationId(779),
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1807),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1808),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1809),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1810),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1811),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1810),
+                        ty: DeclarationId(1812),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -23708,17 +23742,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11478, 11772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(779),
+            id: DeclarationId(781),
             name: Some("PhantomParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "parameter".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                 ],
             },
@@ -23733,12 +23767,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12245, 12322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(780),
+            id: DeclarationId(782),
             name: Some("NominalOpacity".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1811),
+                    ty: DeclarationId(1813),
                 }],
             },
             type_params: vec![],
@@ -23752,25 +23786,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12829, 12895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(781),
+            id: DeclarationId(783),
             name: Some("ArithmeticOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1814),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1815),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1816),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1817),
                     },
                 ],
             },
@@ -23785,33 +23819,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13152, 13201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(782),
+            id: DeclarationId(784),
             name: Some("ComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1818),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1817),
+                        ty: DeclarationId(1819),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1820),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1819),
+                        ty: DeclarationId(1821),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1822),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1823),
                     },
                 ],
             },
@@ -23826,7 +23860,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13303, 13362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(783),
+            id: DeclarationId(785),
             name: Some("PerfBaselineMeasurement".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23851,17 +23885,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13817, 13886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(784),
+            id: DeclarationId(786),
             name: Some("LogicalOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1824),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1825),
                     },
                 ],
             },
@@ -23876,21 +23910,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14120, 14149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(785),
+            id: DeclarationId(787),
             name: Some("OperatorKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1828),
                     },
                 ],
             },
@@ -23905,25 +23939,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14363, 14461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(786),
+            id: DeclarationId(788),
             name: Some("TransformTarget".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1829),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1831),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1832),
                     },
                 ],
             },
@@ -23938,17 +23972,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14623, 14818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(787),
+            id: DeclarationId(789),
             name: Some("BranchPattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1834),
                     },
                 ],
             },
@@ -23963,17 +23997,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14920, 15030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(788),
+            id: DeclarationId(790),
             name: Some("PayloadBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "binding_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "payload_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                 ],
             },
@@ -23988,25 +24022,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15032, 15101),
         });
         declarations.push(Declaration {
-            id: DeclarationId(789),
+            id: DeclarationId(791),
             name: Some("BranchPath".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "pattern".to_string(),
-                        ty: DeclarationId(787),
+                        ty: DeclarationId(789),
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1835),
                     },
                 ],
             },
@@ -24021,13 +24055,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15103, 15211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(790),
+            id: DeclarationId(792),
             name: Some("ParamRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "member".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "slot".to_string(),
@@ -24046,12 +24080,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15810, 15856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(791),
+            id: DeclarationId(793),
             name: Some("TransformRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "node".to_string(),
-                    ty: DeclarationId(701),
+                    ty: DeclarationId(703),
                 }],
             },
             type_params: vec![],
@@ -24065,7 +24099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16368, 16404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(792),
+            id: DeclarationId(794),
             name: Some("ElementRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24073,7 +24107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ty: DeclarationId(93),
                 }],
             },
-            type_params: vec![DeclarationId(793)],
+            type_params: vec![DeclarationId(795)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24084,7 +24118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17021, 17062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(793),
+            id: DeclarationId(795),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -24098,12 +24132,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17021, 17062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(794),
+            id: DeclarationId(796),
             name: Some("MemberDescent".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(790),
+                    ty: DeclarationId(792),
                 }],
             },
             type_params: vec![],
@@ -24117,12 +24151,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17064, 17104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(795),
+            id: DeclarationId(797),
             name: Some("IntraClusterCall".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "transform".to_string(),
-                    ty: DeclarationId(791),
+                    ty: DeclarationId(793),
                 }],
             },
             type_params: vec![],
@@ -24136,17 +24170,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17106, 17157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(796),
+            id: DeclarationId(798),
             name: Some("Cluster".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1836),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1837),
                     },
                 ],
             },
@@ -24161,17 +24195,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17159, 17272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(797),
+            id: DeclarationId(799),
             name: Some("LoopBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1838),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1839),
                     },
                 ],
             },
@@ -24186,11 +24220,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17874, 17974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(798),
+            id: DeclarationId(800),
             name: Some("loop_bound_measure".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(797)],
-                output: DeclarationId(702),
+                inputs: vec![DeclarationId(799)],
+                output: DeclarationId(704),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(36))),
             },
             type_params: vec![],
@@ -24204,29 +24238,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17976, 18129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(799),
+            id: DeclarationId(801),
             name: Some("ValueNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(761),
+                        ty: DeclarationId(763),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1840),
                     },
                 ],
             },
@@ -24241,29 +24275,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18131, 18260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(800),
+            id: DeclarationId(802),
             name: Some("TransformNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(786),
+                        ty: DeclarationId(788),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -24278,12 +24312,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18262, 18387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(801),
+            id: DeclarationId(803),
             name: Some("BranchEmitParticipation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1840),
+                    ty: DeclarationId(1842),
                 }],
             },
             type_params: vec![],
@@ -24297,33 +24331,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18552, 18594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(802),
+            id: DeclarationId(804),
             name: Some("BranchNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1844),
                     },
                 ],
             },
@@ -24338,37 +24372,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18596, 18758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(803),
+            id: DeclarationId(805),
             name: Some("LoopNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "source".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "init".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(797),
+                        ty: DeclarationId(799),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -24383,12 +24417,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18760, 18897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(804),
+            id: DeclarationId(806),
             name: Some("BindEmitParticipation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1843),
+                    ty: DeclarationId(1845),
                 }],
             },
             type_params: vec![],
@@ -24402,37 +24436,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19139, 19182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(805),
+            id: DeclarationId(807),
             name: Some("BindNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "result_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1847),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1848),
                     },
                 ],
             },
@@ -24447,29 +24481,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19184, 19372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(806),
+            id: DeclarationId(808),
             name: Some("Behavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1849),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1851),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1852),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -24484,25 +24518,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19444, 19568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(807),
+            id: DeclarationId(809),
             name: Some("Dag".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1855),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1857),
                     },
                 ],
             },
@@ -24517,12 +24551,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19570, 19689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(808),
+            id: DeclarationId(810),
             name: Some("SubstrateAccessorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "carrier".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -24536,21 +24570,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 21041, 21096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(809),
+            id: DeclarationId(811),
             name: Some("SubstrateAccessorBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -24565,11 +24599,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 21863, 21980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(810),
+            id: DeclarationId(812),
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(702)],
-                output: DeclarationId(1738),
+                inputs: vec![DeclarationId(809), DeclarationId(704)],
+                output: DeclarationId(1740),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22022,
@@ -24587,11 +24621,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 21982, 22037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(811),
+            id: DeclarationId(813),
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701)],
-                output: DeclarationId(1739),
+                inputs: vec![DeclarationId(809), DeclarationId(703)],
+                output: DeclarationId(1741),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22080,
@@ -24609,11 +24643,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22039, 22095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(812),
+            id: DeclarationId(814),
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(702)],
-                output: DeclarationId(1740),
+                inputs: vec![DeclarationId(809), DeclarationId(704)],
+                output: DeclarationId(1742),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22155,
@@ -24631,11 +24665,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22097, 22182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(813),
+            id: DeclarationId(815),
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(703)],
-                output: DeclarationId(1741),
+                inputs: vec![DeclarationId(809), DeclarationId(705)],
+                output: DeclarationId(1743),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22544,
@@ -24653,11 +24687,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22480, 22572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(814),
+            id: DeclarationId(816),
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(228)],
-                output: DeclarationId(1742),
+                inputs: vec![DeclarationId(809), DeclarationId(230)],
+                output: DeclarationId(1744),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23419,
@@ -24675,11 +24709,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23358, 23449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(815),
+            id: DeclarationId(817),
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701)],
-                output: DeclarationId(1743),
+                inputs: vec![DeclarationId(809), DeclarationId(703)],
+                output: DeclarationId(1745),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23745,
@@ -24697,21 +24731,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23685, 23780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(816),
+            id: DeclarationId(818),
             name: Some("WorkflowRoot".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1859),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -24726,11 +24760,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 25748, 25858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(817),
+            id: DeclarationId(819),
             name: Some("workflow_root_port".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(816),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(818),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     27364,
@@ -24748,11 +24782,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 27318, 27393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(818),
+            id: DeclarationId(820),
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1744),
+                output: DeclarationId(1746),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     27750,
@@ -24770,11 +24804,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 27693, 27760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(819),
+            id: DeclarationId(821),
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(703)],
-                output: DeclarationId(1745),
+                inputs: vec![DeclarationId(705)],
+                output: DeclarationId(1747),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     27835,
@@ -24792,12 +24826,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 27762, 27848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(820),
+            id: DeclarationId(822),
             name: Some("MethodRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1228),
+                    ty: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -24811,21 +24845,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/methods.dag", 1604, 1645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(821),
+            id: DeclarationId(823),
             name: Some("CollectionSizeEffect".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1886),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1885),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1888),
                     },
                 ],
             },
@@ -24840,25 +24874,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4923, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(822),
+            id: DeclarationId(824),
             name: Some("CostShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1889),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1890),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1889),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1890),
+                        ty: DeclarationId(1892),
                     },
                 ],
             },
@@ -24873,29 +24907,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5836, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(823),
+            id: DeclarationId(825),
             name: Some("MethodContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "algebra_id".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "method_id".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1891),
+                        ty: DeclarationId(1893),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1892),
+                        ty: DeclarationId(1894),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1895),
                     },
                 ],
             },
@@ -24910,17 +24944,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6688, 6862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(824),
+            id: DeclarationId(826),
             name: Some("SizeVariable".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "source_port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1896),
                     },
                 ],
             },
@@ -24935,11 +24969,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7371, 7438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(825),
+            id: DeclarationId(827),
             name: Some("unnamed_size_variable".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(702)],
-                output: DeclarationId(824),
+                inputs: vec![DeclarationId(704)],
+                output: DeclarationId(826),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 7502, 7534)),
             },
             type_params: vec![],
@@ -24953,11 +24987,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7440, 7534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(826),
+            id: DeclarationId(828),
             name: Some("size_variable_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824), DeclarationId(824)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(826), DeclarationId(826)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(40))),
             },
             type_params: vec![],
@@ -24971,17 +25005,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7536, 7632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(827),
+            id: DeclarationId(829),
             name: Some("DegreeAtLeastTwo".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1897),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1898),
                     },
                 ],
             },
@@ -24996,37 +25030,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8379, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(828),
+            id: DeclarationId(830),
             name: Some("SymbolicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1899),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1900),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1903),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1905),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1907),
                     },
                 ],
             },
@@ -25034,24 +25068,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1906)),
+            inhabits: Some(DeclarationId(1908)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/algebra.dag", 9452, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(829),
+            id: DeclarationId(831),
             name: Some("DominateScanAcc".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "any".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "pivot".to_string(),
-                        ty: DeclarationId(828),
+                        ty: DeclarationId(830),
                     },
                 ],
             },
@@ -25066,11 +25100,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10167, 10225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(830),
+            id: DeclarationId(832),
             name: Some("dominate_scan_init".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(831),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(43))),
             },
             type_params: vec![],
@@ -25084,11 +25118,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10227, 10322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(831),
+            id: DeclarationId(833),
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1860),
+                output: DeclarationId(1862),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -25102,11 +25136,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10908, 10973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(832),
+            id: DeclarationId(834),
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(1861),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(1863),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -25120,11 +25154,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10975, 11062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(833),
+            id: DeclarationId(835),
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(1862),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(1864),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(47))),
             },
             type_params: vec![],
@@ -25138,11 +25172,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11064, 11539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(834),
+            id: DeclarationId(836),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828), DeclarationId(1863)],
-                output: DeclarationId(1864),
+                inputs: vec![DeclarationId(830), DeclarationId(830), DeclarationId(1865)],
+                output: DeclarationId(1866),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(49))),
             },
             type_params: vec![],
@@ -25156,11 +25190,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11541, 11726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(835),
+            id: DeclarationId(837),
             name: Some("reject_all_symbolic_costs".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(54))),
             },
             type_params: vec![],
@@ -25174,10 +25208,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11728, 11856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(836),
+            id: DeclarationId(838),
             name: Some("degree_raw".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
+                inputs: vec![DeclarationId(829)],
                 output: DeclarationId(93),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(62))),
             },
@@ -25192,11 +25226,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11858, 12011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(837),
+            id: DeclarationId(839),
             name: Some("sequential".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(66))),
             },
             type_params: vec![],
@@ -25210,11 +25244,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 12247, 12350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(838),
+            id: DeclarationId(840),
             name: Some("iterate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(70))),
             },
             type_params: vec![],
@@ -25228,11 +25262,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 12536, 12654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(839),
+            id: DeclarationId(841),
             name: Some("max_path_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(74))),
             },
             type_params: vec![],
@@ -25246,11 +25280,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 13514, 13681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(840),
+            id: DeclarationId(842),
             name: Some("keep_or_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(78))),
             },
             type_params: vec![],
@@ -25264,11 +25298,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 13683, 13841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(841),
+            id: DeclarationId(843),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1865)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1867)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(82))),
             },
             type_params: vec![],
@@ -25282,11 +25316,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14143, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(842),
+            id: DeclarationId(844),
             name: Some("dominates".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(135))),
             },
             type_params: vec![],
@@ -25300,11 +25334,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 15113, 17198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(843),
+            id: DeclarationId(845),
             name: Some("same_size_variable".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824), DeclarationId(824)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(826), DeclarationId(826)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(137))),
             },
             type_params: vec![],
@@ -25318,41 +25352,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17200, 17290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(844),
+            id: DeclarationId(846),
             name: Some("AsymptoticClass".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1909),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1910),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1911),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1912),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1913),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1914),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1915),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1916),
                     },
                 ],
             },
@@ -25360,18 +25394,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1915)),
+            inhabits: Some(DeclarationId(1917)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/algebra.dag", 18077, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(845),
+            id: DeclarationId(847),
             name: Some("asymptotic_dominates".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(844), DeclarationId(844)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(846), DeclarationId(846)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(207))),
             },
             type_params: vec![],
@@ -25385,11 +25419,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18320, 20588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(846),
+            id: DeclarationId(848),
             name: Some("meet_asymptotic_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(844), DeclarationId(844)],
-                output: DeclarationId(844),
+                inputs: vec![DeclarationId(846), DeclarationId(846)],
+                output: DeclarationId(846),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(210))),
             },
             type_params: vec![],
@@ -25403,11 +25437,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 20590, 20721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(847),
+            id: DeclarationId(849),
             name: Some("join_asymptotic_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(844), DeclarationId(844)],
-                output: DeclarationId(844),
+                inputs: vec![DeclarationId(846), DeclarationId(846)],
+                output: DeclarationId(846),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(213))),
             },
             type_params: vec![],
@@ -25421,11 +25455,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 20723, 20854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(848),
+            id: DeclarationId(850),
             name: Some("classify_symbolic_cost".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(844),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(846),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 20921, 20954)),
             },
             type_params: vec![],
@@ -25439,11 +25473,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 20856, 20954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(849),
+            id: DeclarationId(851),
             name: Some("normalize".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(222))),
             },
             type_params: vec![],
@@ -25457,11 +25491,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21828, 22193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(850),
+            id: DeclarationId(852),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1866)],
-                output: DeclarationId(1867),
+                inputs: vec![DeclarationId(1868)],
+                output: DeclarationId(1869),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(228))),
             },
             type_params: vec![],
@@ -25475,11 +25509,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22195, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(851),
+            id: DeclarationId(853),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1868)],
-                output: DeclarationId(1869),
+                inputs: vec![DeclarationId(1870)],
+                output: DeclarationId(1871),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(241))),
             },
             type_params: vec![],
@@ -25493,11 +25527,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22501, 22793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(852),
+            id: DeclarationId(854),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1870)],
-                output: DeclarationId(1871),
+                inputs: vec![DeclarationId(1872)],
+                output: DeclarationId(1873),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(248))),
             },
             type_params: vec![],
@@ -25511,11 +25545,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23002, 23165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(853),
+            id: DeclarationId(855),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1872)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1874)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(257))),
             },
             type_params: vec![],
@@ -25529,11 +25563,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23167, 23332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(854),
+            id: DeclarationId(856),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1873)],
-                output: DeclarationId(1874),
+                inputs: vec![DeclarationId(1875)],
+                output: DeclarationId(1876),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(270))),
             },
             type_params: vec![],
@@ -25547,11 +25581,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23490, 23796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(855),
+            id: DeclarationId(857),
             name: Some("is_zero_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -25565,11 +25599,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23798, 24052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(856),
+            id: DeclarationId(858),
             name: Some("is_one_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(290))),
             },
             type_params: vec![],
@@ -25583,11 +25617,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24054, 24307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(857),
+            id: DeclarationId(859),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1875)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1877)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(302))),
             },
             type_params: vec![],
@@ -25601,11 +25635,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25092, 25363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(858),
+            id: DeclarationId(860),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1876)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1878)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(314))),
             },
             type_params: vec![],
@@ -25619,11 +25653,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25365, 25640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(859),
+            id: DeclarationId(861),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1877)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1879)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(331))),
             },
             type_params: vec![],
@@ -25637,11 +25671,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25825, 26246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(860),
+            id: DeclarationId(862),
             name: Some("combine_binary_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(340))),
             },
             type_params: vec![],
@@ -25655,11 +25689,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 26411, 26798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(861),
+            id: DeclarationId(863),
             name: Some("combine_linear_with".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824), DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(826), DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(349))),
             },
             type_params: vec![],
@@ -25673,16 +25707,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 26800, 27209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(862),
+            id: DeclarationId(864),
             name: Some("collapse_linear_square".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(824),
-                    DeclarationId(824),
-                    DeclarationId(828),
-                    DeclarationId(828),
+                    DeclarationId(826),
+                    DeclarationId(826),
+                    DeclarationId(830),
+                    DeclarationId(830),
                 ],
-                output: DeclarationId(828),
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(354))),
             },
             type_params: vec![],
@@ -25696,11 +25730,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27211, 27427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(863),
+            id: DeclarationId(865),
             name: Some("polynomial_square".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(824)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(826)],
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 27483, 27533)),
             },
             type_params: vec![],
@@ -25714,11 +25748,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27429, 27533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(864),
+            id: DeclarationId(866),
             name: Some("product_pair".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(357))),
             },
             type_params: vec![],
@@ -25732,11 +25766,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27535, 27633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(865),
+            id: DeclarationId(867),
             name: Some("fold_or_dominate_scan".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(828)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(831), DeclarationId(830)],
+                output: DeclarationId(831),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(364))),
             },
             type_params: vec![],
@@ -25750,11 +25784,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27635, 27784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(866),
+            id: DeclarationId(868),
             name: Some("scan_hit".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(831)],
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -25768,11 +25802,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27786, 27841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(867),
+            id: DeclarationId(869),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1878), DeclarationId(828)],
-                output: DeclarationId(1879),
+                inputs: vec![DeclarationId(1880), DeclarationId(830)],
+                output: DeclarationId(1881),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -25786,11 +25820,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27843, 28205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(868),
+            id: DeclarationId(870),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1880), DeclarationId(828)],
-                output: DeclarationId(1881),
+                inputs: vec![DeclarationId(1882), DeclarationId(830)],
+                output: DeclarationId(1883),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -25804,11 +25838,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28207, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(869),
+            id: DeclarationId(871),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1882)],
-                output: DeclarationId(1883),
+                inputs: vec![DeclarationId(1884)],
+                output: DeclarationId(1885),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(389))),
             },
             type_params: vec![],
@@ -25822,18 +25856,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28637, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(870),
+            id: DeclarationId(872),
             name: Some("anthropic_messages".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(145),
-                    DeclarationId(228),
-                    DeclarationId(1943),
-                    DeclarationId(93),
-                    DeclarationId(1944),
+                    DeclarationId(147),
+                    DeclarationId(230),
                     DeclarationId(1945),
+                    DeclarationId(93),
+                    DeclarationId(1946),
+                    DeclarationId(1947),
                 ],
-                output: DeclarationId(884),
+                output: DeclarationId(886),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/anthropic_messages.dag",
                     4627,
@@ -25851,18 +25885,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4419, 4656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(871),
+            id: DeclarationId(873),
             name: Some("anthropic_operations".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1146),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1946)),
+            meta_tag: Some(DeclarationId(1948)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -25871,17 +25905,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6515, 6562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(872),
+            id: DeclarationId(874),
             name: Some("AnthropicChatMessage".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1950),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1952),
                     },
                 ],
             },
@@ -25896,17 +25930,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2491, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(873),
+            id: DeclarationId(875),
             name: Some("ImageSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1954),
                     },
                 ],
             },
@@ -25921,17 +25955,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3021, 3136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(874),
+            id: DeclarationId(876),
             name: Some("ContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1956),
                     },
                 ],
             },
@@ -25946,17 +25980,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3138, 3229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(875),
+            id: DeclarationId(877),
             name: Some("AnthropicToolResultContent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1959),
                     },
                 ],
             },
@@ -25971,17 +26005,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3505, 3624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(876),
+            id: DeclarationId(878),
             name: Some("AnthropicUserContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1963),
                     },
                 ],
             },
@@ -25996,17 +26030,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3870, 4064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(877),
+            id: DeclarationId(879),
             name: Some("AnthropicAssistantContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1965),
                     },
                 ],
             },
@@ -26021,37 +26055,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4471, 4637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(878),
+            id: DeclarationId(880),
             name: Some("AnthropicStopReason".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1972),
                     },
                 ],
             },
@@ -26066,29 +26100,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4966, 5102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(879),
+            id: DeclarationId(881),
             name: Some("AnthropicMessages200Citation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1983),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1985),
                     },
                 ],
             },
@@ -26103,33 +26137,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5304, 6050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(880),
+            id: DeclarationId(882),
             name: Some("AnthropicMessages200ContentBlock".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1988),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1996),
                     },
                 ],
             },
@@ -26144,41 +26178,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6587, 7115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(881),
+            id: DeclarationId(883),
             name: Some("AnthropicServerToolName".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2000),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2002),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2004),
                     },
                 ],
             },
@@ -26193,7 +26227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7303, 7485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(882),
+            id: DeclarationId(884),
             name: Some("AnthropicMessages200Usage".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26207,15 +26241,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2006),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2007),
                     },
                 ],
             },
@@ -26230,12 +26264,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7601, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(883),
+            id: DeclarationId(885),
             name: Some("AnthropicMessages200Role".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(2006),
+                    ty: DeclarationId(2008),
                 }],
             },
             type_params: vec![],
@@ -26249,45 +26283,45 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8159, 8202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(884),
+            id: DeclarationId(886),
             name: Some("AnthropicMessages200Body".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "role".to_string(),
-                        ty: DeclarationId(883),
+                        ty: DeclarationId(885),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "model".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stop_reason".to_string(),
-                        ty: DeclarationId(878),
+                        ty: DeclarationId(880),
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "usage".to_string(),
-                        ty: DeclarationId(882),
+                        ty: DeclarationId(884),
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2011),
                     },
                 ],
             },
@@ -26302,21 +26336,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8549, 8880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(885),
+            id: DeclarationId(887),
             name: Some("BinShim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entrypoint_name".to_string(),
-                        ty: DeclarationId(149),
+                        ty: DeclarationId(151),
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -26331,29 +26365,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(886),
+            id: DeclarationId(888),
             name: Some("BootstrapAuthority".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2015),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2016),
                     },
                 ],
             },
@@ -26368,18 +26402,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(887),
+            id: DeclarationId(889),
             name: Some("BootstrapAuthoritySet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(886),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(888),
                     },
                 ],
             },
@@ -26394,15 +26428,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(888),
+            id: DeclarationId(890),
             name: Some("bootstrap_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(887),
+                template: DeclarationId(889),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(887)),
+            meta_tag: Some(DeclarationId(889)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -26410,441 +26444,441 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2015),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2015),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2015),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2014),
+                            constructor: DeclarationId(2016),
                             payload: vec![],
                         },
                     ),
@@ -26856,17 +26890,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(889),
+            id: DeclarationId(891),
             name: Some("BridgeStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2017),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2018),
                     },
                 ],
             },
@@ -26881,12 +26915,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4697, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(890),
+            id: DeclarationId(892),
             name: Some("BridgeLedgerRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1228),
+                    ty: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -26900,25 +26934,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5699, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(891),
+            id: DeclarationId(893),
             name: Some("BridgeLedgerRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "owner".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "status".to_string(),
-                        ty: DeclarationId(889),
+                        ty: DeclarationId(891),
                     },
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -26932,47 +26966,47 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(892), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(665), arguments: vec![TemplateArgument { parameter: DeclarationId(666), value: DeclarationId(891) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2017)), 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(2016), 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(2015), 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(2015), 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(2015), 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(2015), 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(2015), 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(2016), 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(894), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(667), arguments: vec![TemplateArgument { parameter: DeclarationId(668), value: DeclarationId(893) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2019)), 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(2018), 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(2017), 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(2017), 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(2017), 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(2017), 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(2017), 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(2018), 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(893),
+            id: DeclarationId(895),
             name: Some("CleanEmissionContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expression_wrapping".to_string(),
-                        ty: DeclarationId(895),
+                        ty: DeclarationId(897),
                     },
                     Field {
                         label: "pattern_bindings".to_string(),
-                        ty: DeclarationId(896),
+                        ty: DeclarationId(898),
                     },
                     Field {
                         label: "variant_payload_field_access".to_string(),
-                        ty: DeclarationId(897),
+                        ty: DeclarationId(899),
                     },
                     Field {
                         label: "imports".to_string(),
-                        ty: DeclarationId(898),
+                        ty: DeclarationId(900),
                     },
                     Field {
                         label: "block_return".to_string(),
-                        ty: DeclarationId(899),
+                        ty: DeclarationId(901),
                     },
                     Field {
                         label: "variable_bindings".to_string(),
-                        ty: DeclarationId(900),
+                        ty: DeclarationId(902),
                     },
                     Field {
                         label: "match_arm_body".to_string(),
-                        ty: DeclarationId(901),
+                        ty: DeclarationId(903),
                     },
                     Field {
                         label: "correction_style".to_string(),
-                        ty: DeclarationId(902),
+                        ty: DeclarationId(904),
                     },
                     Field {
                         label: "post_emit_verifier".to_string(),
-                        ty: DeclarationId(903),
+                        ty: DeclarationId(905),
                     },
                 ],
             },
@@ -26987,17 +27021,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(894),
+            id: DeclarationId(896),
             name: Some("TargetCleanEmissionBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1019),
+                        ty: DeclarationId(1021),
                     },
                     Field {
                         label: "clean_emission".to_string(),
-                        ty: DeclarationId(893),
+                        ty: DeclarationId(895),
                     },
                 ],
             },
@@ -27012,21 +27046,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(895),
+            id: DeclarationId(897),
             name: Some("ExpressionWrappingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2020),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2022),
                     },
                 ],
             },
@@ -27041,25 +27075,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(896),
+            id: DeclarationId(898),
             name: Some("PatternBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
@@ -27074,17 +27108,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(897),
+            id: DeclarationId(899),
             name: Some("VariantPayloadFieldAccessRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2028),
                     },
                 ],
             },
@@ -27099,21 +27133,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(898),
+            id: DeclarationId(900),
             name: Some("ImportRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2031),
                     },
                 ],
             },
@@ -27128,21 +27162,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(899),
+            id: DeclarationId(901),
             name: Some("BlockReturnRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2034),
                     },
                 ],
             },
@@ -27157,21 +27191,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(900),
+            id: DeclarationId(902),
             name: Some("VariableBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2037),
                     },
                 ],
             },
@@ -27186,21 +27220,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(901),
+            id: DeclarationId(903),
             name: Some("MatchArmBodyRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2040),
                     },
                 ],
             },
@@ -27215,25 +27249,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(902),
+            id: DeclarationId(904),
             name: Some("CorrectionStyle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "indent_unit".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "line_ending".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "string_quote".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "trailing_semicolon".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -27248,21 +27282,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(903),
+            id: DeclarationId(905),
             name: Some("PostEmitVerifier".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "syntax_only".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "expected_exit_code".to_string(),
@@ -27270,7 +27304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "output_policy".to_string(),
-                        ty: DeclarationId(904),
+                        ty: DeclarationId(906),
                     },
                 ],
             },
@@ -27285,25 +27319,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(904),
+            id: DeclarationId(906),
             name: Some("VerifierOutputPolicy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2045),
                     },
                 ],
             },
@@ -27318,41 +27352,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(905),
+            id: DeclarationId(907),
             name: Some("SizeBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2052),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2055),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2057),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2058),
                     },
                 ],
             },
@@ -27367,11 +27401,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1403, 1699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(906),
+            id: DeclarationId(908),
             name: Some("tree_size_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(905),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(907),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     1748,
@@ -27389,41 +27423,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1701, 1779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(907),
+            id: DeclarationId(909),
             name: Some("CallPattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2060),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2063),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2065),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2066),
                     },
                 ],
             },
@@ -27438,11 +27472,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2030, 2477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(908),
+            id: DeclarationId(910),
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701)],
-                output: DeclarationId(2044),
+                inputs: vec![DeclarationId(809), DeclarationId(703)],
+                output: DeclarationId(2046),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2756,
@@ -27460,21 +27494,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2690, 2786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(909),
+            id: DeclarationId(911),
             name: Some("ShrinkFactor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(2065),
+                        ty: DeclarationId(2067),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2068),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2069),
                     },
                 ],
             },
@@ -27489,21 +27523,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2976, 3116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
+            id: DeclarationId(912),
             name: Some("IterationPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2070),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(2069),
+                        ty: DeclarationId(2071),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2072),
                     },
                 ],
             },
@@ -27518,25 +27552,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3278, 3333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
+            id: DeclarationId(913),
             name: Some("LoweringTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "primitive".to_string(),
-                        ty: DeclarationId(910),
+                        ty: DeclarationId(912),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(905),
+                        ty: DeclarationId(907),
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(1147),
+                        ty: DeclarationId(1149),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(2071),
+                        ty: DeclarationId(2073),
                     },
                 ],
             },
@@ -27551,11 +27585,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3525, 3651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
+            id: DeclarationId(914),
             name: Some("lower_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(907)],
-                output: DeclarationId(911),
+                inputs: vec![DeclarationId(909)],
+                output: DeclarationId(913),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     3962,
@@ -27573,11 +27607,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3900, 5513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
+            id: DeclarationId(915),
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(905)],
-                output: DeclarationId(2045),
+                inputs: vec![DeclarationId(907)],
+                output: DeclarationId(2047),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5564,
@@ -27595,11 +27629,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5515, 5989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
+            id: DeclarationId(916),
             name: Some("is_constant_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(905)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(907)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6038,
@@ -27617,7 +27651,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5991, 6209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
+            id: DeclarationId(917),
             name: Some("forever_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -27639,11 +27673,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6290, 6349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
+            id: DeclarationId(918),
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(905)],
-                output: DeclarationId(2046),
+                inputs: vec![DeclarationId(907)],
+                output: DeclarationId(2048),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6492,
@@ -27661,21 +27695,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6442, 6757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
+            id: DeclarationId(919),
             name: Some("IterationDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(2072),
+                        ty: DeclarationId(2074),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(2073),
+                        ty: DeclarationId(2075),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(2074),
+                        ty: DeclarationId(2076),
                     },
                 ],
             },
@@ -27690,11 +27724,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7242, 7425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
+            id: DeclarationId(920),
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(2047),
+                output: DeclarationId(2049),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7558,
@@ -27712,11 +27746,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7478, 8051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
+            id: DeclarationId(921),
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(2048),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(2050),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8123,
@@ -27734,17 +27768,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8053, 8342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(920),
+            id: DeclarationId(922),
             name: Some("Mutability".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(2075),
+                        ty: DeclarationId(2077),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2078),
                     },
                 ],
             },
@@ -27759,17 +27793,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(921),
+            id: DeclarationId(923),
             name: Some("Purity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(2077),
+                        ty: DeclarationId(2079),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2080),
                     },
                 ],
             },
@@ -27784,17 +27818,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
+            id: DeclarationId(924),
             name: Some("Structure".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2081),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2082),
                     },
                 ],
             },
@@ -27809,17 +27843,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
+            id: DeclarationId(925),
             name: Some("Iteration".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2083),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2084),
                     },
                 ],
             },
@@ -27834,25 +27868,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
+            id: DeclarationId(926),
             name: Some("ComputationModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "mutability".to_string(),
-                        ty: DeclarationId(920),
+                        ty: DeclarationId(922),
                     },
                     Field {
                         label: "purity".to_string(),
-                        ty: DeclarationId(921),
+                        ty: DeclarationId(923),
                     },
                     Field {
                         label: "structure".to_string(),
-                        ty: DeclarationId(922),
+                        ty: DeclarationId(924),
                     },
                     Field {
                         label: "iteration".to_string(),
-                        ty: DeclarationId(923),
+                        ty: DeclarationId(925),
                     },
                 ],
             },
@@ -27867,15 +27901,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
+            id: DeclarationId(927),
             name: Some("dag_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(924),
+                template: DeclarationId(926),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(924)),
+            meta_tag: Some(DeclarationId(926)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -27883,28 +27917,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2075),
+                            constructor: DeclarationId(2077),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2077),
+                            constructor: DeclarationId(2079),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2079),
+                            constructor: DeclarationId(2081),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2081),
+                            constructor: DeclarationId(2083),
                             payload: vec![],
                         },
                     ),
@@ -27915,25 +27949,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
+            id: DeclarationId(928),
             name: Some("MemoryModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2086),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2087),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2088),
                     },
                 ],
             },
@@ -27948,17 +27982,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
+            id: DeclarationId(929),
             name: Some("ScopeModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2090),
                     },
                 ],
             },
@@ -27973,17 +28007,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
+            id: DeclarationId(930),
             name: Some("TargetExecutionModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "memory".to_string(),
-                        ty: DeclarationId(926),
+                        ty: DeclarationId(928),
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(927),
+                        ty: DeclarationId(929),
                     },
                 ],
             },
@@ -27998,12 +28032,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
+            id: DeclarationId(931),
             name: Some("SourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(2089),
+                    ty: DeclarationId(2091),
                 }],
             },
             type_params: vec![],
@@ -28017,17 +28051,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
+            id: DeclarationId(932),
             name: Some("ShapeATargetSourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "internal".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(931),
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2092),
                     },
                 ],
             },
@@ -28042,15 +28076,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
+            id: DeclarationId(933),
             name: Some("internal_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(929),
+                template: DeclarationId(931),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(929)),
+            meta_tag: Some(DeclarationId(931)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28069,17 +28103,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(932),
+            id: DeclarationId(934),
             name: Some("ExecutionModelRequirement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2094),
                     },
                 ],
             },
@@ -28094,10 +28128,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
+            id: DeclarationId(935),
             name: Some("VariantId".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -28111,12 +28145,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
+            id: DeclarationId(936),
             name: Some("WireTagValue".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(2093),
+                    ty: DeclarationId(2095),
                 }],
             },
             type_params: vec![],
@@ -28130,17 +28164,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
+            id: DeclarationId(937),
             name: Some("FieldProjection".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2097),
                     },
                 ],
             },
@@ -28155,17 +28189,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7586, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
+            id: DeclarationId(938),
             name: Some("CoproductVariantProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field_projection".to_string(),
-                        ty: DeclarationId(935),
+                        ty: DeclarationId(937),
                     },
                     Field {
                         label: "wire_tag_value".to_string(),
-                        ty: DeclarationId(934),
+                        ty: DeclarationId(936),
                     },
                 ],
             },
@@ -28180,21 +28214,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 8046, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
+            id: DeclarationId(939),
             name: Some("CoproductProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "declaration".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "wire_tag_field".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2098),
                     },
                 ],
             },
@@ -28209,21 +28243,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
+            id: DeclarationId(940),
             name: Some("ShapeATarget".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Rust".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2100),
                     },
                     Field {
                         label: "Go".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2101),
                     },
                 ],
             },
@@ -28238,33 +28272,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5519, 5557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
+            id: DeclarationId(941),
             name: Some("FormAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2107),
                     },
                 ],
             },
@@ -28279,29 +28313,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6357, 6429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
+            id: DeclarationId(942),
             name: Some("BehaviorAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2112),
                     },
                 ],
             },
@@ -28316,17 +28350,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6989, 7049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
+            id: DeclarationId(943),
             name: Some("MethodTemplateContractKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(938),
+                        ty: DeclarationId(940),
                     },
                     Field {
                         label: "dag_method".to_string(),
-                        ty: DeclarationId(820),
+                        ty: DeclarationId(822),
                     },
                 ],
             },
@@ -28341,17 +28375,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7433, 7514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
+            id: DeclarationId(944),
             name: Some("EmissionCell".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "connective".to_string(),
-                        ty: DeclarationId(939),
+                        ty: DeclarationId(941),
                     },
                     Field {
                         label: "behavior".to_string(),
-                        ty: DeclarationId(940),
+                        ty: DeclarationId(942),
                     },
                 ],
             },
@@ -28366,17 +28400,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7947, 8016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
+            id: DeclarationId(945),
             name: Some("EmissionPathProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "row_identity".to_string(),
-                        ty: DeclarationId(941),
+                        ty: DeclarationId(943),
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2113),
                     },
                 ],
             },
@@ -28391,18 +28425,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8362, 8463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
+            id: DeclarationId(946),
             name: Some("emission_path_projections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(943),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(945),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2112)),
+            meta_tag: Some(DeclarationId(2114)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -28413,87 +28447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(256)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(269)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28501,7 +28455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
+                                    FieldValue::Reference(DeclarationId(258)),
                                 )]),
                             ),
                         ]),
@@ -28512,14 +28466,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28533,7 +28487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28552,14 +28506,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28573,7 +28527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28581,7 +28535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
+                                    FieldValue::Reference(DeclarationId(295)),
                                 )]),
                             ),
                         ]),
@@ -28592,14 +28546,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28613,7 +28567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28621,7 +28575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(260)),
+                                    FieldValue::Reference(DeclarationId(273)),
                                 )]),
                             ),
                         ]),
@@ -28632,14 +28586,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28653,7 +28607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28661,7 +28615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
+                                    FieldValue::Reference(DeclarationId(264)),
                                 )]),
                             ),
                         ]),
@@ -28672,14 +28626,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28693,7 +28647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28701,7 +28655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(261)),
+                                    FieldValue::Reference(DeclarationId(262)),
                                 )]),
                             ),
                         ]),
@@ -28712,14 +28666,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28733,7 +28687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28741,7 +28695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(247)),
+                                    FieldValue::Reference(DeclarationId(252)),
                                 )]),
                             ),
                         ]),
@@ -28752,14 +28706,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28773,7 +28727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28781,7 +28735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(246)),
+                                    FieldValue::Reference(DeclarationId(263)),
                                 )]),
                             ),
                         ]),
@@ -28792,14 +28746,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28813,7 +28767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28821,7 +28775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
+                                    FieldValue::Reference(DeclarationId(249)),
                                 )]),
                             ),
                         ]),
@@ -28832,14 +28786,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28853,7 +28807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28861,7 +28815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(291)),
+                                    FieldValue::Reference(DeclarationId(248)),
                                 )]),
                             ),
                         ]),
@@ -28872,14 +28826,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28893,7 +28847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2097),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28901,7 +28855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
+                                    FieldValue::Reference(DeclarationId(265)),
                                 )]),
                             ),
                         ]),
@@ -28912,14 +28866,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28933,7 +28887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28941,7 +28895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(256)),
+                                    FieldValue::Reference(DeclarationId(293)),
                                 )]),
                             ),
                         ]),
@@ -28952,14 +28906,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -28973,7 +28927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2099),
                                     payload: vec![],
                                 },
                             ),
@@ -28981,7 +28935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(269)),
+                                    FieldValue::Reference(DeclarationId(299)),
                                 )]),
                             ),
                         ]),
@@ -28992,14 +28946,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29013,7 +28967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29021,7 +28975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
+                                    FieldValue::Reference(DeclarationId(258)),
                                 )]),
                             ),
                         ]),
@@ -29032,14 +28986,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29053,7 +29007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29072,14 +29026,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29093,7 +29047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29101,7 +29055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
+                                    FieldValue::Reference(DeclarationId(295)),
                                 )]),
                             ),
                         ]),
@@ -29112,14 +29066,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29133,7 +29087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29141,7 +29095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(260)),
+                                    FieldValue::Reference(DeclarationId(273)),
                                 )]),
                             ),
                         ]),
@@ -29152,14 +29106,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29173,7 +29127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29181,7 +29135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
+                                    FieldValue::Reference(DeclarationId(264)),
                                 )]),
                             ),
                         ]),
@@ -29192,14 +29146,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29213,7 +29167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29221,7 +29175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(261)),
+                                    FieldValue::Reference(DeclarationId(262)),
                                 )]),
                             ),
                         ]),
@@ -29232,14 +29186,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29253,7 +29207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29261,7 +29215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(247)),
+                                    FieldValue::Reference(DeclarationId(252)),
                                 )]),
                             ),
                         ]),
@@ -29272,14 +29226,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29293,7 +29247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29301,7 +29255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(246)),
+                                    FieldValue::Reference(DeclarationId(263)),
                                 )]),
                             ),
                         ]),
@@ -29312,14 +29266,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29333,7 +29287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29341,7 +29295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
+                                    FieldValue::Reference(DeclarationId(249)),
                                 )]),
                             ),
                         ]),
@@ -29352,14 +29306,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29373,7 +29327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29381,7 +29335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(291)),
+                                    FieldValue::Reference(DeclarationId(248)),
                                 )]),
                             ),
                         ]),
@@ -29392,14 +29346,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29413,7 +29367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29421,7 +29375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
+                                    FieldValue::Reference(DeclarationId(265)),
                                 )]),
                             ),
                         ]),
@@ -29432,14 +29386,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29453,7 +29407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29461,7 +29415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(292)),
+                                    FieldValue::Reference(DeclarationId(293)),
                                 )]),
                             ),
                         ]),
@@ -29472,14 +29426,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29493,7 +29447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29501,7 +29455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
+                                    FieldValue::Reference(DeclarationId(299)),
                                 )]),
                             ),
                         ]),
@@ -29512,14 +29466,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29533,7 +29487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2098),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29541,7 +29495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
+                                    FieldValue::Reference(DeclarationId(294)),
                                 )]),
                             ),
                         ]),
@@ -29552,14 +29506,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29573,7 +29527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29581,7 +29535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(256)),
+                                    FieldValue::Reference(DeclarationId(250)),
                                 )]),
                             ),
                         ]),
@@ -29592,14 +29546,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29613,7 +29567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2100),
                                     payload: vec![],
                                 },
                             ),
@@ -29621,7 +29575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(269)),
+                                    FieldValue::Reference(DeclarationId(297)),
                                 )]),
                             ),
                         ]),
@@ -29632,14 +29586,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29653,7 +29607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29661,7 +29615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
+                                    FieldValue::Reference(DeclarationId(258)),
                                 )]),
                             ),
                         ]),
@@ -29672,14 +29626,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29693,7 +29647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29701,7 +29655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(261)),
+                                    FieldValue::Reference(DeclarationId(271)),
                                 )]),
                             ),
                         ]),
@@ -29712,14 +29666,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29733,7 +29687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29741,7 +29695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(247)),
+                                    FieldValue::Reference(DeclarationId(295)),
                                 )]),
                             ),
                         ]),
@@ -29752,14 +29706,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29773,7 +29727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29781,7 +29735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(246)),
+                                    FieldValue::Reference(DeclarationId(263)),
                                 )]),
                             ),
                         ]),
@@ -29792,14 +29746,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29813,7 +29767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29821,7 +29775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
+                                    FieldValue::Reference(DeclarationId(249)),
                                 )]),
                             ),
                         ]),
@@ -29832,14 +29786,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29853,7 +29807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29861,7 +29815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(291)),
+                                    FieldValue::Reference(DeclarationId(248)),
                                 )]),
                             ),
                         ]),
@@ -29872,14 +29826,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29893,7 +29847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29901,7 +29855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
+                                    FieldValue::Reference(DeclarationId(265)),
                                 )]),
                             ),
                         ]),
@@ -29912,14 +29866,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29933,7 +29887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29941,7 +29895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(292)),
+                                    FieldValue::Reference(DeclarationId(293)),
                                 )]),
                             ),
                         ]),
@@ -29952,14 +29906,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -29973,7 +29927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -29981,7 +29935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
+                                    FieldValue::Reference(DeclarationId(299)),
                                 )]),
                             ),
                         ]),
@@ -29992,14 +29946,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -30013,7 +29967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "target".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2099),
+                                    constructor: DeclarationId(2101),
                                     payload: vec![],
                                 },
                             ),
@@ -30021,7 +29975,87 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 "dag_method".to_string(),
                                 FieldValue::Record(vec![(
                                     "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
+                                    FieldValue::Reference(DeclarationId(294)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2106),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2109),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2101),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "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(2106),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2109),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2101),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(297)),
                                 )]),
                             ),
                         ]),
@@ -30032,14 +30066,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2104),
+                                    constructor: DeclarationId(2106),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2107),
+                                    constructor: DeclarationId(2109),
                                     payload: vec![],
                                 },
                             ),
@@ -30052,49 +30086,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8884, 14433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
+            id: DeclarationId(947),
             name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2124),
                     },
                 ],
             },
@@ -30109,21 +30143,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
+            id: DeclarationId(948),
             name: Some("Correction".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "new_source".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -30138,17 +30172,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1435, 1688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
+            id: DeclarationId(949),
             name: Some("DiagnosticKindDecl".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(758),
+                        ty: DeclarationId(760),
                     },
                 ],
             },
@@ -30163,12 +30197,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 2468, 2531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(948),
+            id: DeclarationId(950),
             name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1228),
+                    ty: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -30182,17 +30216,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 4733, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
+            id: DeclarationId(951),
             name: Some("AnyDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2126),
                     },
                 ],
             },
@@ -30207,25 +30241,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5402, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
+            id: DeclarationId(952),
             name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(949),
+                        ty: DeclarationId(951),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "message".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2127),
                     },
                 ],
             },
@@ -30240,37 +30274,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5880, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(951),
+            id: DeclarationId(953),
             name: Some("EmissionDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2135),
                     },
                 ],
             },
@@ -30285,21 +30319,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 8622, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(952),
+            id: DeclarationId(954),
             name: Some("Witness".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2151),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(953)],
+            type_params: vec![DeclarationId(955)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30310,7 +30344,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(953),
+            id: DeclarationId(955),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30324,17 +30358,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(954),
+            id: DeclarationId(956),
             name: Some("OptionalDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2153),
                     },
                 ],
             },
@@ -30349,21 +30383,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(955),
+            id: DeclarationId(957),
             name: Some("DimensionReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2160),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(956)],
+            type_params: vec![DeclarationId(958)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30374,7 +30408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(956),
+            id: DeclarationId(958),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30388,29 +30422,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(957),
+            id: DeclarationId(959),
             name: Some("AnalysisDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2164),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(958)],
+            type_params: vec![DeclarationId(960)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30421,7 +30455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(958),
+            id: DeclarationId(960),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30435,18 +30469,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(959),
+            id: DeclarationId(961),
             name: Some("Dimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(961),
+                    ty: DeclarationId(963),
                 }],
             },
-            type_params: vec![DeclarationId(960), DeclarationId(961)],
+            type_params: vec![DeclarationId(962), DeclarationId(963)],
             phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(960),
-                algebra: DeclarationId(2163),
+                parameter: DeclarationId(962),
+                algebra: DeclarationId(2165),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -30457,7 +30491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(960),
+            id: DeclarationId(962),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30471,7 +30505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
+            id: DeclarationId(963),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30485,7 +30519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
+            id: DeclarationId(964),
             name: Some("Meters".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30499,7 +30533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
+            id: DeclarationId(965),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30513,7 +30547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
+            id: DeclarationId(966),
             name: Some("Kilograms".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30527,7 +30561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
+            id: DeclarationId(967),
             name: Some("Amperes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30541,7 +30575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
+            id: DeclarationId(968),
             name: Some("Kelvin".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30555,7 +30589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
+            id: DeclarationId(969),
             name: Some("Moles".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30569,7 +30603,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
+            id: DeclarationId(970),
             name: Some("Candela".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30583,18 +30617,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(969),
+            id: DeclarationId(971),
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2134),
-                    DeclarationId(2135),
                     DeclarationId(2136),
+                    DeclarationId(2137),
+                    DeclarationId(2138),
                 ],
-                output: DeclarationId(2137),
+                output: DeclarationId(2139),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
-            type_params: vec![DeclarationId(970), DeclarationId(971)],
+            type_params: vec![DeclarationId(972), DeclarationId(973)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30605,7 +30639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(970),
+            id: DeclarationId(972),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30619,7 +30653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(971),
+            id: DeclarationId(973),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30633,18 +30667,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
+            id: DeclarationId(974),
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2138),
-                    DeclarationId(2139),
                     DeclarationId(2140),
+                    DeclarationId(2141),
+                    DeclarationId(2142),
                 ],
-                output: DeclarationId(2141),
+                output: DeclarationId(2143),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
-            type_params: vec![DeclarationId(973), DeclarationId(974)],
+            type_params: vec![DeclarationId(975), DeclarationId(976)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30655,7 +30689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
+            id: DeclarationId(975),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30669,7 +30703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
+            id: DeclarationId(976),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30683,14 +30717,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
+            id: DeclarationId(977),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2142), DeclarationId(2143), DeclarationId(977)],
-                output: DeclarationId(2144),
+                inputs: vec![DeclarationId(2144), DeclarationId(2145), DeclarationId(979)],
+                output: DeclarationId(2146),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
-            type_params: vec![DeclarationId(976), DeclarationId(977)],
+            type_params: vec![DeclarationId(978), DeclarationId(979)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30701,7 +30735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
+            id: DeclarationId(978),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30715,7 +30749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(977),
+            id: DeclarationId(979),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30729,14 +30763,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(978),
+            id: DeclarationId(980),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2145), DeclarationId(2146), DeclarationId(980)],
-                output: DeclarationId(2147),
+                inputs: vec![DeclarationId(2147), DeclarationId(2148), DeclarationId(982)],
+                output: DeclarationId(2149),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![DeclarationId(979), DeclarationId(980)],
+            type_params: vec![DeclarationId(981), DeclarationId(982)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -30747,7 +30781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(979),
+            id: DeclarationId(981),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -30761,7 +30795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(980),
+            id: DeclarationId(982),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -30775,10 +30809,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
+            id: DeclarationId(983),
             name: Some("EmissionRule".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -30792,17 +30826,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 2797, 2823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
+            id: DeclarationId(984),
             name: Some("OptionalSourceSpan".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2167),
                     },
                 ],
             },
@@ -30817,7 +30851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3681, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(983),
+            id: DeclarationId(985),
             name: Some("EmissionProvenance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30827,11 +30861,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rule".to_string(),
-                        ty: DeclarationId(981),
+                        ty: DeclarationId(983),
                     },
                     Field {
                         label: "source_span".to_string(),
-                        ty: DeclarationId(982),
+                        ty: DeclarationId(984),
                     },
                 ],
             },
@@ -30846,29 +30880,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 4898, 5008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
+            id: DeclarationId(986),
             name: Some("TypeRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "is_copy".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -30887,29 +30921,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(985),
+            id: DeclarationId(987),
             name: Some("TargetIntegerTypeInhabitance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(986),
+                        ty: DeclarationId(988),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -30924,21 +30958,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 2385, 2840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(986),
+            id: DeclarationId(988),
             name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2171),
                     },
                 ],
             },
@@ -30953,21 +30987,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4334, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(987),
+            id: DeclarationId(989),
             name: Some("FieldBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dag_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "access".to_string(),
-                        ty: DeclarationId(988),
+                        ty: DeclarationId(990),
                     },
                     Field {
                         label: "borrowed_read".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -30982,17 +31016,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4688, 4772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(988),
+            id: DeclarationId(990),
             name: Some("FieldAccess".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2173),
                     },
                 ],
             },
@@ -31007,25 +31041,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5155, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
+            id: DeclarationId(991),
             name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31044,21 +31078,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(990),
+            id: DeclarationId(992),
             name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31077,25 +31111,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5357, 5467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(991),
+            id: DeclarationId(993),
             name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1002),
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31114,7 +31148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5469, 5628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(992),
+            id: DeclarationId(994),
             name: Some("CallableParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -31124,7 +31158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "disposition".to_string(),
-                        ty: DeclarationId(993),
+                        ty: DeclarationId(995),
                     },
                 ],
             },
@@ -31139,17 +31173,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6050, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(993),
+            id: DeclarationId(995),
             name: Some("ParameterDisposition".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2176),
                     },
                 ],
             },
@@ -31164,17 +31198,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6581, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(994),
+            id: DeclarationId(996),
             name: Some("StringOwnershipAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2178),
                     },
                 ],
             },
@@ -31189,17 +31223,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7044, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(995),
+            id: DeclarationId(997),
             name: Some("StringLifetimeAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2180),
                     },
                 ],
             },
@@ -31214,21 +31248,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7399, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(996),
+            id: DeclarationId(998),
             name: Some("StringGrowabilityAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2183),
                     },
                 ],
             },
@@ -31243,12 +31277,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7678, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(997),
+            id: DeclarationId(999),
             name: Some("StringEncodingAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2182),
+                    ty: DeclarationId(2184),
                 }],
             },
             type_params: vec![],
@@ -31262,37 +31296,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8054, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(998),
+            id: DeclarationId(1000),
             name: Some("StringFamilyInhabitanceRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target_type".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "ownership".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "lifetime".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "growability".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "encoding".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -31307,21 +31341,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8684, 8923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(999),
+            id: DeclarationId(1001),
             name: Some("TypeInstantiationRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31340,49 +31374,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8925, 9044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1000),
+            id: DeclarationId(1002),
             name: Some("CallableStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2194),
                     },
                 ],
             },
@@ -31397,49 +31431,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9449, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1001),
+            id: DeclarationId(1003),
             name: Some("PatternRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1002),
+                        ty: DeclarationId(1004),
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "scrutinee".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "empty_pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cons_pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "head_expr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "tail_expr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -31458,17 +31492,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11557, 11846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1002),
+            id: DeclarationId(1004),
             name: Some("PatternStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2196),
                     },
                 ],
             },
@@ -31483,17 +31517,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12286, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1003),
+            id: DeclarationId(1005),
             name: Some("StatementSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "let_binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "let_binding_inferred".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31508,21 +31542,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12354, 12431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1004),
+            id: DeclarationId(1006),
             name: Some("ExpressionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field_access".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "function_call".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "closure".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31537,17 +31571,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12433, 12523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1005),
+            id: DeclarationId(1007),
             name: Some("ForEachSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "prefix".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31562,21 +31596,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12525, 12584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1006),
+            id: DeclarationId(1008),
             name: Some("ControlFlowSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "if_else".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "match_arm".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(1005),
+                        ty: DeclarationId(1007),
                     },
                 ],
             },
@@ -31591,21 +31625,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12586, 12683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1007),
+            id: DeclarationId(1009),
             name: Some("LiteralSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "true_keyword".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "false_keyword".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "string_delimiter".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31620,12 +31654,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12685, 12781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1008),
+            id: DeclarationId(1010),
             name: Some("ModuleSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "path_separator".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -31639,29 +31673,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12783, 12829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
+            id: DeclarationId(1011),
             name: Some("FunctionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "definition".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "definition_exported".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "definition_void".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "param_with_type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "param_separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31676,12 +31710,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12831, 12983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
+            id: DeclarationId(1012),
             name: Some("TypeApplicationSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "optional".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -31695,29 +31729,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12985, 13034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
+            id: DeclarationId(1013),
             name: Some("TypeDefinitionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "struct_def".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "struct_field".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_def".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_unit_variant".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_data_variant".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31732,17 +31766,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13248, 13396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
+            id: DeclarationId(1014),
             name: Some("RecordDeriveTemplateBundle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "struct_def_no_debug".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "enum_def_no_debug".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31757,41 +31791,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14057, 14150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
+            id: DeclarationId(1015),
             name: Some("PatternMatchSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "match_expr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "match_arm".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_pattern_positional".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_pattern_empty".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "field_binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "field_binding_separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "wildcard".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31806,65 +31840,65 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14854, 15094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1014),
+            id: DeclarationId(1016),
             name: Some("CollectionOps".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "concat_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "length_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "fold_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "filter_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "any_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "all_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "map_contract".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "filter".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "contains".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "empty_list".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "list_literal".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cons".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31879,29 +31913,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15096, 16332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1015),
+            id: DeclarationId(1017),
             name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "struct_literal".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "struct_field_init".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "struct_field_separator".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_construction".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_named_construction".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -31916,17 +31950,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16334, 16520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1016),
+            id: DeclarationId(1018),
             name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(1017),
+                        ty: DeclarationId(1019),
                     },
                     Field {
                         label: "construct".to_string(),
-                        ty: DeclarationId(1018),
+                        ty: DeclarationId(1020),
                     },
                 ],
             },
@@ -31941,17 +31975,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16522, 16597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1017),
+            id: DeclarationId(1019),
             name: Some("ReadStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2198),
                     },
                 ],
             },
@@ -31966,17 +32000,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1018),
+            id: DeclarationId(1020),
             name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2200),
                     },
                 ],
             },
@@ -31991,57 +32025,57 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17432, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
+            id: DeclarationId(1021),
             name: Some("LanguageSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -32056,17 +32090,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17488, 18014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1020),
+            id: DeclarationId(1022),
             name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2202),
                     },
                 ],
             },
@@ -32081,17 +32115,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19388, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1021),
+            id: DeclarationId(1023),
             name: Some("MethodEmitTemplate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2204),
                     },
                 ],
             },
@@ -32106,29 +32140,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20578, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
+            id: DeclarationId(1024),
             name: Some("MethodTemplateContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dag_method".to_string(),
-                        ty: DeclarationId(820),
+                        ty: DeclarationId(822),
                     },
                     Field {
                         label: "runtime_template".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "emit_template".to_string(),
-                        ty: DeclarationId(1021),
+                        ty: DeclarationId(1023),
                     },
                     Field {
                         label: "wraps_result".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(1020),
+                        ty: DeclarationId(1022),
                     },
                 ],
             },
@@ -32143,12 +32177,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1023),
+            id: DeclarationId(1025),
             name: Some("BootstrapFixture".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "virtual_path".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -32162,33 +32196,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
+            id: DeclarationId(1026),
             name: Some("BootstrapFixtureSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                     Field {
                         label: "cross_target_coverage".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1025),
                     },
                 ],
             },
@@ -32203,15 +32237,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1025),
+            id: DeclarationId(1027),
             name: Some("bootstrap_fixture_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1024),
+                template: DeclarationId(1026),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1024)),
+            meta_tag: Some(DeclarationId(1026)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32277,15 +32311,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1908, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1026),
+            id: DeclarationId(1028),
             name: Some("go_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32294,7 +32328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(254)),
+                            FieldValue::Reference(DeclarationId(256)),
                         )]),
                     ),
                     (
@@ -32306,7 +32340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -32319,7 +32353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32330,15 +32364,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3213, 3515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1027),
+            id: DeclarationId(1029),
             name: Some("go_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32347,7 +32381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(272)),
+                            FieldValue::Reference(DeclarationId(274)),
                         )]),
                     ),
                     (
@@ -32357,7 +32391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -32370,7 +32404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32381,15 +32415,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3517, 3803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1028),
+            id: DeclarationId(1030),
             name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32398,7 +32432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(268)),
+                            FieldValue::Reference(DeclarationId(270)),
                         )]),
                     ),
                     (
@@ -32408,7 +32442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -32421,7 +32455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32432,15 +32466,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3895, 4182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1029),
+            id: DeclarationId(1031),
             name: Some("go_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32449,7 +32483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(264)),
+                            FieldValue::Reference(DeclarationId(266)),
                         )]),
                     ),
                     (
@@ -32461,7 +32495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -32474,7 +32508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32485,15 +32519,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4617, 4931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1030),
+            id: DeclarationId(1032),
             name: Some("go_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32502,7 +32536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(275)),
+                            FieldValue::Reference(DeclarationId(277)),
                         )]),
                     ),
                     (
@@ -32514,7 +32548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -32527,7 +32561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32538,15 +32572,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5417, 5699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1031),
+            id: DeclarationId(1033),
             name: Some("go_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32555,7 +32589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(261)),
+                            FieldValue::Reference(DeclarationId(263)),
                         )]),
                     ),
                     (
@@ -32567,7 +32601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -32580,7 +32614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32591,15 +32625,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5701, 5993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1032),
+            id: DeclarationId(1034),
             name: Some("go_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32608,7 +32642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(247)),
+                            FieldValue::Reference(DeclarationId(249)),
                         )]),
                     ),
                     (
@@ -32620,7 +32654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -32633,7 +32667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32644,15 +32678,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5995, 6275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1033),
+            id: DeclarationId(1035),
             name: Some("go_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32661,7 +32695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(246)),
+                            FieldValue::Reference(DeclarationId(248)),
                         )]),
                     ),
                     (
@@ -32673,7 +32707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -32686,7 +32720,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32697,15 +32731,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6277, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1034),
+            id: DeclarationId(1036),
             name: Some("go_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -32714,7 +32748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(263)),
+                            FieldValue::Reference(DeclarationId(265)),
                         )]),
                     ),
                     (
@@ -32726,7 +32760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -32739,7 +32773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32750,18 +32784,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6559, 6857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1035),
+            id: DeclarationId(1037),
             name: Some("go_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2203)),
+            meta_tag: Some(DeclarationId(2205)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -32770,7 +32804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(256)),
+                            FieldValue::Reference(DeclarationId(258)),
                         )]),
                     ),
                     (
@@ -32780,7 +32814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -32793,7 +32827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32803,7 +32837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(269)),
+                            FieldValue::Reference(DeclarationId(271)),
                         )]),
                     ),
                     (
@@ -32815,7 +32849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -32828,7 +32862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32838,7 +32872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(293)),
+                            FieldValue::Reference(DeclarationId(295)),
                         )]),
                     ),
                     (
@@ -32850,7 +32884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -32863,21 +32897,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(1031)),
-                FieldValue::Reference(DeclarationId(1032)),
                 FieldValue::Reference(DeclarationId(1033)),
                 FieldValue::Reference(DeclarationId(1034)),
+                FieldValue::Reference(DeclarationId(1035)),
+                FieldValue::Reference(DeclarationId(1036)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(291)),
+                            FieldValue::Reference(DeclarationId(293)),
                         )]),
                     ),
                     (
@@ -32887,7 +32921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -32900,7 +32934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32910,7 +32944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(297)),
+                            FieldValue::Reference(DeclarationId(299)),
                         )]),
                     ),
                     (
@@ -32920,7 +32954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -32933,7 +32967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32943,7 +32977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(292)),
+                            FieldValue::Reference(DeclarationId(294)),
                         )]),
                     ),
                     (
@@ -32955,7 +32989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -32968,7 +33002,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -32978,7 +33012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(248)),
+                            FieldValue::Reference(DeclarationId(250)),
                         )]),
                     ),
                     (
@@ -32990,7 +33024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -33003,7 +33037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -33013,7 +33047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(295)),
+                            FieldValue::Reference(DeclarationId(297)),
                         )]),
                     ),
                     (
@@ -33025,7 +33059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -33038,7 +33072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -33049,29 +33083,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6859, 8941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1036),
+            id: DeclarationId(1038),
             name: Some("RecursionShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2223),
                     },
                 ],
             },
@@ -33086,29 +33120,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5605, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
+            id: DeclarationId(1039),
             name: Some("InductiveField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "type_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "variant_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "field_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(1036),
+                        ty: DeclarationId(1038),
                     },
                     Field {
                         label: "element_type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -33123,11 +33157,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7170, 7592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
+            id: DeclarationId(1040),
             name: Some("recursion_shape_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1036), DeclarationId(1036)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1038), DeclarationId(1038)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)),
             },
             type_params: vec![],
@@ -33141,11 +33175,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7594, 8034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
+            id: DeclarationId(1041),
             name: Some("inductive_field_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1037), DeclarationId(1037)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1039), DeclarationId(1039)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)),
             },
             type_params: vec![],
@@ -33159,11 +33193,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 8036, 8302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
+            id: DeclarationId(1042),
             name: Some("inductive_field_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1037), DeclarationId(228)],
-                output: DeclarationId(1154),
+                inputs: vec![DeclarationId(1039), DeclarationId(230)],
+                output: DeclarationId(1156),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)),
             },
             type_params: vec![],
@@ -33177,29 +33211,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 8678, 8799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
+            id: DeclarationId(1043),
             name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2228),
                     },
                 ],
             },
@@ -33214,11 +33248,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9945, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
+            id: DeclarationId(1044),
             name: Some("sub_value_to_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041)],
-                output: DeclarationId(1147),
+                inputs: vec![DeclarationId(1043)],
+                output: DeclarationId(1149),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     11134,
@@ -33236,11 +33270,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 11062, 11737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1043),
+            id: DeclarationId(1045),
             name: Some("shrink_factor_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(909), DeclarationId(909)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(911), DeclarationId(911)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     12205,
@@ -33258,11 +33292,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 12143, 12691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1044),
+            id: DeclarationId(1046),
             name: Some("meet_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1041)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1043)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     13282,
@@ -33280,11 +33314,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 13202, 14694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1045),
+            id: DeclarationId(1047),
             name: Some("join_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1041)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1043)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     15026,
@@ -33302,11 +33336,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 14946, 16329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1046),
+            id: DeclarationId(1048),
             name: Some("compose_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1037)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1039)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     17472,
@@ -33324,11 +33358,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 17384, 17594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1047),
+            id: DeclarationId(1049),
             name: Some("compose_sub_value_relations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041), DeclarationId(1041)],
-                output: DeclarationId(1041),
+                inputs: vec![DeclarationId(1043), DeclarationId(1043)],
+                output: DeclarationId(1043),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     18450,
@@ -33346,11 +33380,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 18342, 19796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1048),
+            id: DeclarationId(1050),
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041)],
-                output: DeclarationId(2204),
+                inputs: vec![DeclarationId(1043)],
+                output: DeclarationId(2206),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -33368,11 +33402,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20498, 21367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
+            id: DeclarationId(1051),
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1041)],
-                output: DeclarationId(2205),
+                inputs: vec![DeclarationId(1043)],
+                output: DeclarationId(2207),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -33390,25 +33424,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21880, 22864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
+            id: DeclarationId(1052),
             name: Some("PolynomialExponent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2232),
                     },
                 ],
             },
@@ -33423,11 +33457,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24107, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1051),
+            id: DeclarationId(1053),
             name: Some("poly_exp_degree_one".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1050),
+                output: DeclarationId(1052),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     24411,
@@ -33445,17 +33479,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24364, 24450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
+            id: DeclarationId(1054),
             name: Some("AtomicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2233),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2234),
                     },
                 ],
             },
@@ -33470,37 +33504,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24962, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
+            id: DeclarationId(1055),
             name: Some("CostBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2245),
                     },
                 ],
             },
@@ -33515,11 +33549,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26709, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
+            id: DeclarationId(1056),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2206)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(2208)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     27880,
@@ -33537,11 +33571,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27830, 27986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
+            id: DeclarationId(1057),
             name: Some("cost_bound_is_sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1053)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1055)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28310,
@@ -33559,11 +33593,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
+            id: DeclarationId(1058),
             name: Some("cost_bound_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1053)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1055)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(406))),
             },
             type_params: vec![],
@@ -33577,11 +33611,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1057),
+            id: DeclarationId(1059),
             name: Some("atomic_cost_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1052)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(1054)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(415))),
             },
             type_params: vec![],
@@ -33595,11 +33629,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29519, 29839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1058),
+            id: DeclarationId(1060),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2207)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(2209)],
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29913,
@@ -33617,11 +33651,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1059),
+            id: DeclarationId(1061),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2208)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(2210)],
+                output: DeclarationId(830),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(417))),
             },
             type_params: vec![],
@@ -33635,11 +33669,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1060),
+            id: DeclarationId(1062),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2210)],
-                output: DeclarationId(828),
+                inputs: vec![DeclarationId(2212)],
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30137,
@@ -33657,11 +33691,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1061),
+            id: DeclarationId(1063),
             name: Some("cost_constant".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30206,
@@ -33679,11 +33713,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1062),
+            id: DeclarationId(1064),
             name: Some("cost_linear".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30267,
@@ -33701,11 +33735,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1063),
+            id: DeclarationId(1065),
             name: Some("cost_poly".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30406,
@@ -33723,11 +33757,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
+            id: DeclarationId(1066),
             name: Some("cost_root".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     30855,
@@ -33745,11 +33779,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30806, 31129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
+            id: DeclarationId(1067),
             name: Some("cost_sqrt".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31171,
@@ -33767,11 +33801,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31130, 31204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
+            id: DeclarationId(1068),
             name: Some("cost_cbrt".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31246,
@@ -33789,11 +33823,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31205, 31279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
+            id: DeclarationId(1069),
             name: Some("cost_log".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31320,
@@ -33811,11 +33845,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31280, 31370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
+            id: DeclarationId(1070),
             name: Some("cost_nlogn".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31414,
@@ -33833,11 +33867,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31372, 31532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1069),
+            id: DeclarationId(1071),
             name: Some("cost_graph_linear".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31602,
@@ -33855,13 +33889,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31534, 31778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1070),
+            id: DeclarationId(1072),
             name: Some("RecurrenceForm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "branches".to_string(),
@@ -33888,11 +33922,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 32935, 33026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1071),
+            id: DeclarationId(1073),
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2211),
+                output: DeclarationId(2213),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -33910,11 +33944,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33574, 33868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1072),
+            id: DeclarationId(1074),
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2212),
+                output: DeclarationId(2214),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -33932,11 +33966,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33870, 34702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1073),
+            id: DeclarationId(1075),
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2213),
+                output: DeclarationId(2215),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -33954,11 +33988,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35118, 35285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1074),
+            id: DeclarationId(1076),
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2214),
+                output: DeclarationId(2216),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -33976,11 +34010,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35589, 36682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
+            id: DeclarationId(1077),
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2215),
+                output: DeclarationId(2217),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -33998,7 +34032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36854, 37015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
+            id: DeclarationId(1078),
             name: Some("ceil_log_iter".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -34007,7 +34041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(2216),
+                output: DeclarationId(2218),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -34025,11 +34059,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37101, 37534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1077),
+            id: DeclarationId(1079),
             name: Some("master_theorem".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1070)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(1072)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37589,
@@ -34047,11 +34081,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37536, 39626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1078),
+            id: DeclarationId(1080),
             name: Some("catamorphism_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(1053),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     39979,
@@ -34069,16 +34103,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 39909, 40137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1079),
+            id: DeclarationId(1081),
             name: Some("derive_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(228),
+                    DeclarationId(230),
                     DeclarationId(93),
-                    DeclarationId(909),
+                    DeclarationId(911),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40636,
@@ -34096,11 +34130,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40535, 41660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1080),
+            id: DeclarationId(1082),
             name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41993,
@@ -34118,11 +34152,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41954, 42050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1081),
+            id: DeclarationId(1083),
             name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42093,
@@ -34140,11 +34174,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42052, 42151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1082),
+            id: DeclarationId(1084),
             name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42251,
@@ -34162,11 +34196,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42215, 42306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1083),
+            id: DeclarationId(1085),
             name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42503,
@@ -34184,11 +34218,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42465, 42618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1084),
+            id: DeclarationId(1086),
             name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42698,
@@ -34206,11 +34240,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42664, 42813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1085),
+            id: DeclarationId(1087),
             name: Some("karatsuba_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42980,
@@ -34228,11 +34262,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1086),
+            id: DeclarationId(1088),
             name: Some("strassen_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43264,
@@ -34250,11 +34284,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1087),
+            id: DeclarationId(1089),
             name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43495,
@@ -34272,11 +34306,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1088),
+            id: DeclarationId(1090),
             name: Some("cube_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43555,
@@ -34294,11 +34328,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
+            id: DeclarationId(1091),
             name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43662,
@@ -34316,11 +34350,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
+            id: DeclarationId(1092),
             name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43929,
@@ -34338,11 +34372,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
+            id: DeclarationId(1093),
             name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     44071,
@@ -34360,11 +34394,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
+            id: DeclarationId(1094),
             name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     44456,
@@ -34382,11 +34416,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
+            id: DeclarationId(1095),
             name: Some("floyd_warshall_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1053),
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     44723,
@@ -34404,18 +34438,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 44684, 44761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
+            id: DeclarationId(1096),
             name: Some("signed_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2244)),
+            meta_tag: Some(DeclarationId(2246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -34430,18 +34464,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
+            id: DeclarationId(1097),
             name: Some("unsigned_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2245)),
+            meta_tag: Some(DeclarationId(2247)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -34456,37 +34490,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
+            id: DeclarationId(1098),
             name: Some("Lens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2252),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2253),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1097)],
+            type_params: vec![DeclarationId(1099)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34497,7 +34531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
+            id: DeclarationId(1099),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
@@ -34511,17 +34545,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
+            id: DeclarationId(1100),
             name: Some("SectionRef".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2255),
                     },
                 ],
             },
@@ -34536,12 +34570,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3285, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1099),
+            id: DeclarationId(1101),
             name: Some("DiagnosticSeverity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2254),
+                    ty: DeclarationId(2256),
                 }],
             },
             type_params: vec![],
@@ -34555,21 +34589,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4271, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1100),
+            id: DeclarationId(1102),
             name: Some("LensEnforcement".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2258),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1101), DeclarationId(1102)],
+            type_params: vec![DeclarationId(1103), DeclarationId(1104)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34580,7 +34614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1101),
+            id: DeclarationId(1103),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34594,7 +34628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1102),
+            id: DeclarationId(1104),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
@@ -34608,21 +34642,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1103),
+            id: DeclarationId(1105),
             name: Some("EnforceableLens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2260),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1104), DeclarationId(1105)],
+            type_params: vec![DeclarationId(1106), DeclarationId(1107)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34633,7 +34667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1104),
+            id: DeclarationId(1106),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34647,7 +34681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1105),
+            id: DeclarationId(1107),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
@@ -34661,33 +34695,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
+            id: DeclarationId(1108),
             name: Some("EnforcedApplication".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "section".to_string(),
-                        ty: DeclarationId(1098),
+                        ty: DeclarationId(1100),
                     },
                     Field {
                         label: "budget".to_string(),
-                        ty: DeclarationId(1108),
+                        ty: DeclarationId(1110),
                     },
                     Field {
                         label: "diagnostic_severity".to_string(),
-                        ty: DeclarationId(1099),
+                        ty: DeclarationId(1101),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1107), DeclarationId(1108)],
+            type_params: vec![DeclarationId(1109), DeclarationId(1110)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34698,7 +34732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
+            id: DeclarationId(1109),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34712,7 +34746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
+            id: DeclarationId(1110),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
@@ -34726,25 +34760,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
+            id: DeclarationId(1111),
             name: Some("IntrospectApplication".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "section".to_string(),
-                        ty: DeclarationId(1098),
+                        ty: DeclarationId(1100),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1110)],
+            type_params: vec![DeclarationId(1112)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34755,7 +34789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
+            id: DeclarationId(1112),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
@@ -34769,21 +34803,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
+            id: DeclarationId(1113),
             name: Some("Lookup".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2266),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1112)],
+            type_params: vec![DeclarationId(1114)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34794,7 +34828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
+            id: DeclarationId(1114),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -34808,11 +34842,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
+            id: DeclarationId(1115),
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2261),
+                output: DeclarationId(2263),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -34826,11 +34860,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
+            id: DeclarationId(1116),
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2262),
+                output: DeclarationId(2264),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -34844,15 +34878,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
+            id: DeclarationId(1117),
             name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34861,7 +34895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(254)),
+                            FieldValue::Reference(DeclarationId(256)),
                         )]),
                     ),
                     (
@@ -34871,7 +34905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -34884,7 +34918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -34899,15 +34933,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
+            id: DeclarationId(1118),
             name: Some("python_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34916,7 +34950,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(272)),
+                            FieldValue::Reference(DeclarationId(274)),
                         )]),
                     ),
                     (
@@ -34926,7 +34960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -34939,7 +34973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -34954,15 +34988,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
+            id: DeclarationId(1119),
             name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34971,7 +35005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(268)),
+                            FieldValue::Reference(DeclarationId(270)),
                         )]),
                     ),
                     (
@@ -34981,7 +35015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -34994,7 +35028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35009,15 +35043,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
+            id: DeclarationId(1120),
             name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35026,7 +35060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(264)),
+                            FieldValue::Reference(DeclarationId(266)),
                         )]),
                     ),
                     (
@@ -35038,7 +35072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -35051,7 +35085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35066,15 +35100,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
+            id: DeclarationId(1121),
             name: Some("python_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35083,7 +35117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(275)),
+                            FieldValue::Reference(DeclarationId(277)),
                         )]),
                     ),
                     (
@@ -35095,7 +35129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -35108,7 +35142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35123,15 +35157,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
+            id: DeclarationId(1122),
             name: Some("python_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35140,7 +35174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(261)),
+                            FieldValue::Reference(DeclarationId(263)),
                         )]),
                     ),
                     (
@@ -35152,7 +35186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -35165,7 +35199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35180,15 +35214,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
+            id: DeclarationId(1123),
             name: Some("python_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35197,7 +35231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(247)),
+                            FieldValue::Reference(DeclarationId(249)),
                         )]),
                     ),
                     (
@@ -35209,7 +35243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -35222,7 +35256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35237,15 +35271,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
+            id: DeclarationId(1124),
             name: Some("python_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35254,7 +35288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(246)),
+                            FieldValue::Reference(DeclarationId(248)),
                         )]),
                     ),
                     (
@@ -35266,7 +35300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -35279,7 +35313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35294,15 +35328,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
+            id: DeclarationId(1125),
             name: Some("python_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35311,7 +35345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(263)),
+                            FieldValue::Reference(DeclarationId(265)),
                         )]),
                     ),
                     (
@@ -35323,7 +35357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -35336,7 +35370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35351,18 +35385,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
+            id: DeclarationId(1126),
             name: Some("python_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2265)),
+            meta_tag: Some(DeclarationId(2267)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35371,7 +35405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(256)),
+                            FieldValue::Reference(DeclarationId(258)),
                         )]),
                     ),
                     (
@@ -35381,7 +35415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35394,7 +35428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35404,7 +35438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(269)),
+                            FieldValue::Reference(DeclarationId(271)),
                         )]),
                     ),
                     (
@@ -35414,7 +35448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -35427,7 +35461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35437,7 +35471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(293)),
+                            FieldValue::Reference(DeclarationId(295)),
                         )]),
                     ),
                     (
@@ -35447,7 +35481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -35460,7 +35494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35470,7 +35504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(271)),
+                            FieldValue::Reference(DeclarationId(273)),
                         )]),
                     ),
                     (
@@ -35482,7 +35516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -35495,7 +35529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35505,7 +35539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(262)),
+                            FieldValue::Reference(DeclarationId(264)),
                         )]),
                     ),
                     (
@@ -35517,7 +35551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -35530,7 +35564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35540,7 +35574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(260)),
+                            FieldValue::Reference(DeclarationId(262)),
                         )]),
                     ),
                     (
@@ -35552,7 +35586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -35565,7 +35599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35575,7 +35609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(250)),
+                            FieldValue::Reference(DeclarationId(252)),
                         )]),
                     ),
                     (
@@ -35587,7 +35621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -35600,21 +35634,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(1120)),
-                FieldValue::Reference(DeclarationId(1121)),
                 FieldValue::Reference(DeclarationId(1122)),
                 FieldValue::Reference(DeclarationId(1123)),
+                FieldValue::Reference(DeclarationId(1124)),
+                FieldValue::Reference(DeclarationId(1125)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(291)),
+                            FieldValue::Reference(DeclarationId(293)),
                         )]),
                     ),
                     (
@@ -35624,7 +35658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35637,7 +35671,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35647,7 +35681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(297)),
+                            FieldValue::Reference(DeclarationId(299)),
                         )]),
                     ),
                     (
@@ -35657,7 +35691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35670,7 +35704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35680,7 +35714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(292)),
+                            FieldValue::Reference(DeclarationId(294)),
                         )]),
                     ),
                     (
@@ -35692,7 +35726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -35705,7 +35739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35715,7 +35749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(248)),
+                            FieldValue::Reference(DeclarationId(250)),
                         )]),
                     ),
                     (
@@ -35725,7 +35759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -35738,7 +35772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35748,7 +35782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(295)),
+                            FieldValue::Reference(DeclarationId(297)),
                         )]),
                     ),
                     (
@@ -35758,7 +35792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -35771,7 +35805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -35786,25 +35820,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
+            id: DeclarationId(1127),
             name: Some("ResourceHandle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "resource_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "key".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "cap".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                 ],
             },
@@ -35819,12 +35853,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1126),
+            id: DeclarationId(1128),
             name: Some("ResourceReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1228),
+                    ty: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -35838,17 +35872,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1127),
+            id: DeclarationId(1129),
             name: Some("NamedField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                 ],
             },
@@ -35863,29 +35897,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
+            id: DeclarationId(1130),
             name: Some("Value".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2274),
                     },
                 ],
             },
@@ -35900,15 +35934,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2122, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1129),
+            id: DeclarationId(1131),
             name: Some("ProgramObservation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observed".to_string(),
-                    ty: DeclarationId(1130),
+                    ty: DeclarationId(1132),
                 }],
             },
-            type_params: vec![DeclarationId(1130)],
+            type_params: vec![DeclarationId(1132)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -35919,7 +35953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1130),
+            id: DeclarationId(1132),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -35933,12 +35967,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1131),
+            id: DeclarationId(1133),
             name: Some("EvalFrame".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2273),
+                    ty: DeclarationId(2275),
                 }],
             },
             type_params: vec![],
@@ -35952,12 +35986,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1132),
+            id: DeclarationId(1134),
             name: Some("EvalStateStack".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2274),
+                    ty: DeclarationId(2276),
                 }],
             },
             type_params: vec![],
@@ -35971,12 +36005,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1133),
+            id: DeclarationId(1135),
             name: Some("EvalStateKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "state".to_string(),
-                    ty: DeclarationId(1132),
+                    ty: DeclarationId(1134),
                 }],
             },
             type_params: vec![],
@@ -35990,12 +36024,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
+            id: DeclarationId(1136),
             name: Some("EvalStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2275),
+                    ty: DeclarationId(2277),
                 }],
             },
             type_params: vec![],
@@ -36009,17 +36043,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
+            id: DeclarationId(1137),
             name: Some("InputEvaluationOrder".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2279),
                     },
                 ],
             },
@@ -36034,25 +36068,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1136),
+            id: DeclarationId(1138),
             name: Some("EvalMemoKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "program".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "state_key".to_string(),
-                        ty: DeclarationId(1133),
+                        ty: DeclarationId(1135),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1134),
+                        ty: DeclarationId(1136),
                     },
                 ],
             },
@@ -36067,11 +36101,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
+            id: DeclarationId(1139),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(701), DeclarationId(2266)],
-                output: DeclarationId(1128),
+                inputs: vec![DeclarationId(809), DeclarationId(703), DeclarationId(2268)],
+                output: DeclarationId(1130),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
             type_params: vec![],
@@ -36084,13 +36118,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1138), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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(261)))])), ("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(2202), 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(2200), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) });
-        declarations.push(Declaration { id: DeclarationId(1139), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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(247)))])), ("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(2202), 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(2200), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) });
-        declarations.push(Declaration { id: DeclarationId(1140), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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(246)))])), ("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(2202), 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(2200), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) });
-        declarations.push(Declaration { id: DeclarationId(1141), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), 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 mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2202), 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(2200), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) });
-        declarations.push(Declaration { id: DeclarationId(1142), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(665), arguments: vec![TemplateArgument { parameter: DeclarationId(666), value: DeclarationId(1022) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2278)), 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(256)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(269)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), payload: vec![] })]), 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}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), 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}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), 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}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), payload: vec![] })]), FieldValue::Reference(DeclarationId(1138)), FieldValue::Reference(DeclarationId(1139)), FieldValue::Reference(DeclarationId(1140)), FieldValue::Reference(DeclarationId(1141)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(291)))])), ("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(2201), 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(2200), 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("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2201), 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(2200), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) });
+        declarations.push(Declaration { id: DeclarationId(1140), name: Some("rust_filter_method_template_contract".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::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(2204), 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(2202), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) });
+        declarations.push(Declaration { id: DeclarationId(1141), name: Some("rust_any_method_template_contract".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::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(2204), 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(2202), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) });
+        declarations.push(Declaration { id: DeclarationId(1142), name: Some("rust_all_method_template_contract".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::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(2204), 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(2202), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) });
+        declarations.push(Declaration { id: DeclarationId(1143), name: Some("rust_flat_map_method_template_contract".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::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(2204), 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(2202), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) });
+        declarations.push(Declaration { id: DeclarationId(1144), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(667), arguments: vec![TemplateArgument { parameter: DeclarationId(668), value: DeclarationId(1024) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2280)), 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(2203), 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(2202), 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(2203), 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(2202), 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(2203), 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(2202), 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(2203), 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(2202), 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(2203), 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(2202), 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(2203), 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(2202), 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(2203), 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(2202), payload: vec![] })]), FieldValue::Reference(DeclarationId(1140)), FieldValue::Reference(DeclarationId(1141)), FieldValue::Reference(DeclarationId(1142)), FieldValue::Reference(DeclarationId(1143)), 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(2203), 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(2202), 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(2203), 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(2202), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) });
         declarations.push(Declaration {
-            id: DeclarationId(1143),
+            id: DeclarationId(1145),
             name: Some("InputField".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -36104,17 +36138,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1144),
+            id: DeclarationId(1146),
             name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "method".to_string(),
-                        ty: DeclarationId(196),
+                        ty: DeclarationId(198),
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(710),
+                        ty: DeclarationId(712),
                     },
                 ],
             },
@@ -36129,12 +36163,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 4616, 4688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
+            id: DeclarationId(1147),
             name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1228),
+                    ty: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -36148,21 +36182,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 5496, 5539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
+            id: DeclarationId(1148),
             name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "callable".to_string(),
-                        ty: DeclarationId(1145),
+                        ty: DeclarationId(1147),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "endpoint".to_string(),
-                        ty: DeclarationId(1144),
+                        ty: DeclarationId(1146),
                     },
                 ],
             },
@@ -36177,21 +36211,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6748, 6858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
+            id: DeclarationId(1149),
             name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2292),
                     },
                 ],
             },
@@ -36206,10 +36240,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 742, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
+            id: DeclarationId(1150),
             name: Some("evidence_rank".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1147)],
+                inputs: vec![DeclarationId(1149)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)),
             },
@@ -36224,11 +36258,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 812, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
+            id: DeclarationId(1151),
             name: Some("merge_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1147), DeclarationId(1147)],
-                output: DeclarationId(1147),
+                inputs: vec![DeclarationId(1149), DeclarationId(1149)],
+                output: DeclarationId(1149),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1082,
@@ -36246,11 +36280,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 1005, 1410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
+            id: DeclarationId(1152),
             name: Some("join_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1147), DeclarationId(1147)],
-                output: DeclarationId(1147),
+                inputs: vec![DeclarationId(1149), DeclarationId(1149)],
+                output: DeclarationId(1149),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1556,
@@ -36268,11 +36302,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 1480, 1755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
+            id: DeclarationId(1153),
             name: Some("promote_to_strict".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1147)],
-                output: DeclarationId(1147),
+                inputs: vec![DeclarationId(1149)],
+                output: DeclarationId(1149),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2217,
@@ -36290,11 +36324,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2150, 2336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
+            id: DeclarationId(1154),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2280), DeclarationId(2281)],
-                output: DeclarationId(2282),
+                inputs: vec![DeclarationId(2282), DeclarationId(2283)],
+                output: DeclarationId(2284),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -36312,11 +36346,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2400, 2664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1153),
+            id: DeclarationId(1155),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2283), DeclarationId(228), DeclarationId(1147)],
-                output: DeclarationId(2284),
+                inputs: vec![DeclarationId(2285), DeclarationId(230), DeclarationId(1149)],
+                output: DeclarationId(2286),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -36334,29 +36368,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2701, 3007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1154),
+            id: DeclarationId(1156),
             name: Some("RankingDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2294),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2297),
                     },
                 ],
             },
@@ -36371,17 +36405,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3306, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1155),
+            id: DeclarationId(1157),
             name: Some("PositiveDescentAmount".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2299),
                     },
                 ],
             },
@@ -36396,10 +36430,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4478, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1156),
+            id: DeclarationId(1158),
             name: Some("positive_descent_count".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1155)],
+                inputs: vec![DeclarationId(1157)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -36418,17 +36452,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4818, 4989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1157),
+            id: DeclarationId(1159),
             name: Some("ProportionalDivisor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2300),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2301),
                     },
                 ],
             },
@@ -36443,10 +36477,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5455, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1158),
+            id: DeclarationId(1160),
             name: Some("proportional_divisor_to_int".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1157)],
+                inputs: vec![DeclarationId(1159)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -36465,7 +36499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5547, 5722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
+            id: DeclarationId(1161),
             name: Some("peano_literal_materialization_cap".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -36487,11 +36521,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5906, 5959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1160),
+            id: DeclarationId(1162),
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2285),
+                output: DeclarationId(2287),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -36509,11 +36543,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6341, 6780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
+            id: DeclarationId(1163),
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2286),
+                output: DeclarationId(2288),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -36531,37 +36565,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6782, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
+            id: DeclarationId(1164),
             name: Some("DescentSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2303),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2305),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2308),
                     },
                 ],
             },
@@ -36576,12 +36610,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7626, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
+            id: DeclarationId(1165),
             name: Some("TerminationProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2307),
+                    ty: DeclarationId(2309),
                 }],
             },
             type_params: vec![],
@@ -36595,21 +36629,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7949, 8011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
+            id: DeclarationId(1166),
             name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "callee".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2310),
                     },
                 ],
             },
@@ -36624,12 +36658,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8156, 8242),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
+            id: DeclarationId(1167),
             name: Some("StrictEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2309),
+                    ty: DeclarationId(2311),
                 }],
             },
             type_params: vec![],
@@ -36643,17 +36677,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8716, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
+            id: DeclarationId(1168),
             name: Some("NonStrictEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2312),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2313),
                     },
                 ],
             },
@@ -36668,17 +36702,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9112, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
+            id: DeclarationId(1169),
             name: Some("DescentResidual".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2315),
                     },
                 ],
             },
@@ -36693,21 +36727,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10238, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
+            id: DeclarationId(1170),
             name: Some("DescentExecutionProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cluster".to_string(),
-                        ty: DeclarationId(704),
+                        ty: DeclarationId(706),
                     },
                     Field {
                         label: "port".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -36722,11 +36756,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 11157, 11263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
+            id: DeclarationId(1171),
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(704), DeclarationId(702)],
-                output: DeclarationId(2287),
+                inputs: vec![DeclarationId(809), DeclarationId(706), DeclarationId(704)],
+                output: DeclarationId(2289),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -36744,11 +36778,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 12279, 12439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1170),
+            id: DeclarationId(1172),
             name: Some("timing_lens_module_path_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(156),
+                output: DeclarationId(158),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(419))),
             },
             type_params: vec![],
@@ -36762,7 +36796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 1391, 1472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1171),
+            id: DeclarationId(1173),
             name: Some("Nanoseconds".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -36781,25 +36815,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 1933, 1966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1172),
+            id: DeclarationId(1174),
             name: Some("TimingMeasurement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2319),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2322),
                     },
                 ],
             },
@@ -36814,37 +36848,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 3977, 4077),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1173),
+            id: DeclarationId(1175),
             name: Some("WorkflowObservationAnchor".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_node".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                     Field {
                         label: "artifact_digest".to_string(),
-                        ty: DeclarationId(171),
+                        ty: DeclarationId(173),
                     },
                     Field {
                         label: "producer_id".to_string(),
-                        ty: DeclarationId(172),
+                        ty: DeclarationId(174),
                     },
                     Field {
                         label: "observer_id".to_string(),
-                        ty: DeclarationId(173),
+                        ty: DeclarationId(175),
                     },
                     Field {
                         label: "prover_id".to_string(),
-                        ty: DeclarationId(174),
+                        ty: DeclarationId(176),
                     },
                     Field {
                         label: "attached_at_ns".to_string(),
-                        ty: DeclarationId(1171),
+                        ty: DeclarationId(1173),
                     },
                     Field {
                         label: "workflow_run_id".to_string(),
-                        ty: DeclarationId(175),
+                        ty: DeclarationId(177),
                     },
                 ],
             },
@@ -36859,12 +36893,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5538, 5787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1174),
+            id: DeclarationId(1176),
             name: Some("TimingObservationSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2321),
+                    ty: DeclarationId(2323),
                 }],
             },
             type_params: vec![],
@@ -36878,17 +36912,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5871, 5945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1175),
+            id: DeclarationId(1177),
             name: Some("TimingObservationEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "anchor".to_string(),
-                        ty: DeclarationId(1173),
+                        ty: DeclarationId(1175),
                     },
                     Field {
                         label: "measurement".to_string(),
-                        ty: DeclarationId(1172),
+                        ty: DeclarationId(1174),
                     },
                 ],
             },
@@ -36903,12 +36937,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5947, 6047),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
+            id: DeclarationId(1178),
             name: Some("TimingBudget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "max".to_string(),
-                    ty: DeclarationId(1171),
+                    ty: DeclarationId(1173),
                 }],
             },
             type_params: vec![],
@@ -36922,11 +36956,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6185, 6225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
+            id: DeclarationId(1179),
             name: Some("timing_measurement_unobserved".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1172),
+                output: DeclarationId(1174),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(421))),
             },
             type_params: vec![],
@@ -36940,11 +36974,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6227, 6297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
+            id: DeclarationId(1180),
             name: Some("timing_measurement_lens_combine".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1172), DeclarationId(1172), DeclarationId(126)],
-                output: DeclarationId(1172),
+                inputs: vec![DeclarationId(1174), DeclarationId(1174), DeclarationId(128)],
+                output: DeclarationId(1174),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(453))),
             },
             type_params: vec![],
@@ -36958,11 +36992,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6455, 7347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
+            id: DeclarationId(1181),
             name: Some("timing_sequential_op".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1172), DeclarationId(1172)],
-                output: DeclarationId(1172),
+                inputs: vec![DeclarationId(1174), DeclarationId(1174)],
+                output: DeclarationId(1174),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(456))),
             },
             type_params: vec![],
@@ -36976,11 +37010,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7422, 7558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
+            id: DeclarationId(1182),
             name: Some("nanoseconds_zero".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1171),
+                output: DeclarationId(1173),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(459))),
             },
             type_params: vec![],
@@ -36994,11 +37028,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7560, 7613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
+            id: DeclarationId(1183),
             name: Some("timing_sequential_identity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1172),
+                output: DeclarationId(1174),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(462))),
             },
             type_params: vec![],
@@ -37012,11 +37046,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7615, 7713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
+            id: DeclarationId(1184),
             name: Some("timing_branch_op".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1172), DeclarationId(1172)],
-                output: DeclarationId(1172),
+                inputs: vec![DeclarationId(1174), DeclarationId(1174)],
+                output: DeclarationId(1174),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(465))),
             },
             type_params: vec![],
@@ -37030,11 +37064,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7773, 7906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
+            id: DeclarationId(1185),
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2315),
+                output: DeclarationId(2317),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(467))),
             },
             type_params: vec![],
@@ -37048,11 +37082,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7908, 7972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
+            id: DeclarationId(1186),
             name: Some("timing_lens_behavior_span".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(806)],
-                output: DeclarationId(157),
+                inputs: vec![DeclarationId(808)],
+                output: DeclarationId(159),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(474))),
             },
             type_params: vec![],
@@ -37066,11 +37100,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8155, 8354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
+            id: DeclarationId(1187),
             name: Some("timing_lens_scaffold_non_evidence_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(157)],
-                output: DeclarationId(950),
+                inputs: vec![DeclarationId(230), DeclarationId(159)],
+                output: DeclarationId(952),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(479))),
             },
             type_params: vec![],
@@ -37084,11 +37118,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8601, 8813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1186),
+            id: DeclarationId(1188),
             name: Some("timing_lens_degenerate_empty_dag_span".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(157),
+                output: DeclarationId(159),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(484))),
             },
             type_params: vec![],
@@ -37102,11 +37136,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1187),
+            id: DeclarationId(1189),
             name: Some("timing_lens_validate_non_observed".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(228)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(809), DeclarationId(230)],
+                output: DeclarationId(956),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(500))),
             },
             type_params: vec![],
@@ -37120,11 +37154,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9643, 10348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1188),
+            id: DeclarationId(1190),
             name: Some("timing_measurement_iterate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1172), DeclarationId(797)],
-                output: DeclarationId(1172),
+                inputs: vec![DeclarationId(1174), DeclarationId(799)],
+                output: DeclarationId(1174),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(509))),
             },
             type_params: vec![],
@@ -37138,11 +37172,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10673, 11034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1189),
+            id: DeclarationId(1191),
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(806)],
-                output: DeclarationId(2316),
+                inputs: vec![DeclarationId(809), DeclarationId(808)],
+                output: DeclarationId(2318),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(546))),
             },
             type_params: vec![],
@@ -37156,11 +37190,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 12637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1190),
+            id: DeclarationId(1192),
             name: Some("timing_lens_validate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(1172)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(809), DeclarationId(1174)],
+                output: DeclarationId(956),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(560))),
             },
             type_params: vec![],
@@ -37174,189 +37208,189 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12639, 13484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1191),
+            id: DeclarationId(1193),
             name: Some("TokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2348),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2349),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2351),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2352),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2353),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2354),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2355),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2356),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2357),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2358),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2359),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2360),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2359),
+                        ty: DeclarationId(2361),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2360),
+                        ty: DeclarationId(2362),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2361),
+                        ty: DeclarationId(2363),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2362),
+                        ty: DeclarationId(2364),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2363),
+                        ty: DeclarationId(2365),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2364),
+                        ty: DeclarationId(2366),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2365),
+                        ty: DeclarationId(2367),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2366),
+                        ty: DeclarationId(2368),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2367),
+                        ty: DeclarationId(2369),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2368),
+                        ty: DeclarationId(2370),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2369),
+                        ty: DeclarationId(2371),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2370),
+                        ty: DeclarationId(2372),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2371),
+                        ty: DeclarationId(2373),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2372),
+                        ty: DeclarationId(2374),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2373),
+                        ty: DeclarationId(2375),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2374),
+                        ty: DeclarationId(2376),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2379),
                     },
                 ],
             },
@@ -37371,17 +37405,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
+            id: DeclarationId(1194),
             name: Some("Token".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1191),
+                        ty: DeclarationId(1193),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -37396,61 +37430,61 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1355, 1406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
+            id: DeclarationId(1195),
             name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2380),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2383),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2384),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2385),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2386),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2387),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2388),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2389),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2388),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2389),
+                        ty: DeclarationId(2391),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2392),
                     },
                 ],
             },
@@ -37465,121 +37499,121 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1765, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
+            id: DeclarationId(1196),
             name: Some("PunctTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2391),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2394),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2393),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2394),
+                        ty: DeclarationId(2396),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2397),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2396),
+                        ty: DeclarationId(2398),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2399),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2398),
+                        ty: DeclarationId(2400),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2399),
+                        ty: DeclarationId(2401),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2402),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2403),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2402),
+                        ty: DeclarationId(2404),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2403),
+                        ty: DeclarationId(2405),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2406),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2407),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2408),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2409),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2408),
+                        ty: DeclarationId(2410),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2411),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2410),
+                        ty: DeclarationId(2412),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2411),
+                        ty: DeclarationId(2413),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2412),
+                        ty: DeclarationId(2414),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2413),
+                        ty: DeclarationId(2415),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2414),
+                        ty: DeclarationId(2416),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2415),
+                        ty: DeclarationId(2417),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2416),
+                        ty: DeclarationId(2418),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2417),
+                        ty: DeclarationId(2419),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2418),
+                        ty: DeclarationId(2420),
                     },
                 ],
             },
@@ -37594,17 +37628,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
+            id: DeclarationId(1197),
             name: Some("LocalPunctSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "pattern".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1194),
+                        ty: DeclarationId(1196),
                     },
                 ],
             },
@@ -37619,13 +37653,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
+            id: DeclarationId(1198),
             name: Some("StringEscapeSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "suffix".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "output_codepoint".to_string(),
@@ -37644,10 +37678,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
+            id: DeclarationId(1199),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -37661,10 +37695,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
+            id: DeclarationId(1200),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(149),
+                template: DeclarationId(151),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -37678,7 +37712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
+            id: DeclarationId(1201),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -37692,15 +37726,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
+            id: DeclarationId(1202),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1199),
+                template: DeclarationId(1201),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1199)),
+            meta_tag: Some(DeclarationId(1201)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -37709,15 +37743,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
+            id: DeclarationId(1203),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1199),
+                template: DeclarationId(1201),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1199)),
+            meta_tag: Some(DeclarationId(1201)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -37726,7 +37760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
+            id: DeclarationId(1204),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -37740,15 +37774,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
+            id: DeclarationId(1205),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1202),
+                template: DeclarationId(1204),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1202)),
+            meta_tag: Some(DeclarationId(1204)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -37757,7 +37791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
+            id: DeclarationId(1206),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -37771,15 +37805,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
+            id: DeclarationId(1207),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1204),
+                template: DeclarationId(1206),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1204)),
+            meta_tag: Some(DeclarationId(1206)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -37788,49 +37822,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
+            id: DeclarationId(1208),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2424),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2423),
+                        ty: DeclarationId(2425),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2426),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2425),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2428),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2427),
+                        ty: DeclarationId(2429),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2430),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2431),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2433),
                     },
                 ],
             },
@@ -37845,17 +37879,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
+            id: DeclarationId(1209),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2434),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2435),
                     },
                 ],
             },
@@ -37870,17 +37904,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
+            id: DeclarationId(1210),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1206),
+                        ty: DeclarationId(1208),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1207),
+                        ty: DeclarationId(1209),
                     },
                 ],
             },
@@ -37895,17 +37929,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
+            id: DeclarationId(1211),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2436),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2437),
                     },
                 ],
             },
@@ -37920,12 +37954,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
+            id: DeclarationId(1212),
             name: Some("PerfBudgetComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2436),
+                    ty: DeclarationId(2438),
                 }],
             },
             type_params: vec![],
@@ -37939,21 +37973,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3998, 4042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
+            id: DeclarationId(1213),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2439),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2441),
                     },
                 ],
             },
@@ -37968,105 +38002,105 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4831, 4901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
+            id: DeclarationId(1214),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2445),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2447),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2451),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2455),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2456),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2458),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2457),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2460),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2459),
+                        ty: DeclarationId(2461),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2461),
+                        ty: DeclarationId(2463),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2465),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2467),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2468),
                     },
                 ],
             },
@@ -38081,7 +38115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4903, 15825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1213),
+            id: DeclarationId(1215),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38095,12 +38129,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15933, 15953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
+            id: DeclarationId(1216),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1228),
+                    ty: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -38114,29 +38148,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16096, 16151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
+            id: DeclarationId(1217),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "source".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "file_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1212),
+                        ty: DeclarationId(1214),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2469),
                     },
                 ],
             },
@@ -38151,17 +38185,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16761, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
+            id: DeclarationId(1218),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2470),
                     },
                 ],
             },
@@ -38176,17 +38210,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16896, 16955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
+            id: DeclarationId(1219),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "claim_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2471),
                     },
                 ],
             },
@@ -38201,11 +38235,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17153, 17234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
+            id: DeclarationId(1220),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1215)],
-                output: DeclarationId(2419),
+                inputs: vec![DeclarationId(1217)],
+                output: DeclarationId(2421),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17676,
@@ -38223,11 +38257,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17605, 17692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
+            id: DeclarationId(1221),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1215)],
-                output: DeclarationId(1217),
+                inputs: vec![DeclarationId(1217)],
+                output: DeclarationId(1219),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17750,
@@ -38245,11 +38279,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17694, 17835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
+            id: DeclarationId(1222),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2420)],
-                output: DeclarationId(2421),
+                inputs: vec![DeclarationId(2422)],
+                output: DeclarationId(2423),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17918,
@@ -38267,11 +38301,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17837, 17957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
+            id: DeclarationId(1223),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(2470),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(2472),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(562))),
             },
             type_params: vec![],
@@ -38285,7 +38319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1222),
+            id: DeclarationId(1224),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38299,7 +38333,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(1223),
+            id: DeclarationId(1225),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38313,7 +38347,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(1224),
+            id: DeclarationId(1226),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38327,7 +38361,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(1225),
+            id: DeclarationId(1227),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38341,7 +38375,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(1226),
+            id: DeclarationId(1228),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38355,7 +38389,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(1227),
+            id: DeclarationId(1229),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38369,7 +38403,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(1228),
+            id: DeclarationId(1230),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -38383,15 +38417,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1229),
+            id: DeclarationId(1231),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38399,14 +38433,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2084),
+                            constructor: DeclarationId(2086),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2087),
+                            constructor: DeclarationId(2089),
                             payload: vec![],
                         },
                     ),
@@ -38417,22 +38451,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2055, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1230),
+            id: DeclarationId(1232),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(931)),
+                        FieldValue::Reference(DeclarationId(933)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -38447,15 +38481,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2159, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1231),
+            id: DeclarationId(1233),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38468,22 +38502,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2311, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1232),
+            id: DeclarationId(1234),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
@@ -38509,22 +38543,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2388, 2518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1233),
+            id: DeclarationId(1235),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
@@ -38550,22 +38584,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2520, 2654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1234),
+            id: DeclarationId(1236),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38578,17 +38612,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1763),
+                                constructor: DeclarationId(1765),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1762),
+                                        constructor: DeclarationId(1764),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1760),
+                                            constructor: DeclarationId(1762),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -38600,7 +38634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1233)),
+                        FieldValue::Reference(DeclarationId(1235)),
                     ),
                 ],
             }),
@@ -38609,22 +38643,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2656, 2959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1235),
+            id: DeclarationId(1237),
             name: Some("go_integer_inhabit_int_platform_dependent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38637,13 +38671,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1232)),
+                        FieldValue::Reference(DeclarationId(1234)),
                     ),
                 ],
             }),
@@ -38652,26 +38686,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3397, 3598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1236),
+            id: DeclarationId(1238),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38693,26 +38727,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3600, 3731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1237),
+            id: DeclarationId(1239),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38734,26 +38768,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3733, 3870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1238),
+            id: DeclarationId(1240),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38775,26 +38809,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3872, 4010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1239),
+            id: DeclarationId(1241),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38816,26 +38850,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4012, 4150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1240),
+            id: DeclarationId(1242),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38857,26 +38891,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4152, 4311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1241),
+            id: DeclarationId(1243),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(704)),
+                        FieldValue::Reference(DeclarationId(706)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38898,26 +38932,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4313, 4460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1242),
+            id: DeclarationId(1244),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(758)),
+                        FieldValue::Reference(DeclarationId(760)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38937,7 +38971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -38960,26 +38994,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4462, 4703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1243),
+            id: DeclarationId(1245),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(759)),
+                        FieldValue::Reference(DeclarationId(761)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39001,26 +39035,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4705, 4853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1244),
+            id: DeclarationId(1246),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(760)),
+                        FieldValue::Reference(DeclarationId(762)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39041,7 +39075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -39060,7 +39094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -39081,7 +39115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -39105,26 +39139,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4855, 5238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1245),
+            id: DeclarationId(1247),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(157)),
+                        FieldValue::Reference(DeclarationId(159)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39145,7 +39179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -39164,7 +39198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -39183,7 +39217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -39207,26 +39241,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5240, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1246),
+            id: DeclarationId(1248),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(761)),
+                        FieldValue::Reference(DeclarationId(763)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39248,26 +39282,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5636, 5790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1247),
+            id: DeclarationId(1249),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(762)),
+                        FieldValue::Reference(DeclarationId(764)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39289,26 +39323,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5792, 5946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1248),
+            id: DeclarationId(1250),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(769)),
+                        FieldValue::Reference(DeclarationId(771)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39330,26 +39364,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5948, 6117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1249),
+            id: DeclarationId(1251),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(765)),
+                        FieldValue::Reference(DeclarationId(767)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39371,26 +39405,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6119, 6263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1250),
+            id: DeclarationId(1252),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(763)),
+                        FieldValue::Reference(DeclarationId(765)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39414,26 +39448,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6265, 6450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1251),
+            id: DeclarationId(1253),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(764)),
+                        FieldValue::Reference(DeclarationId(766)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39455,26 +39489,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6452, 6612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1252),
+            id: DeclarationId(1254),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(770)),
+                        FieldValue::Reference(DeclarationId(772)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39495,7 +39529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -39514,7 +39548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39538,26 +39572,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6614, 6916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1253),
+            id: DeclarationId(1255),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(771)),
+                        FieldValue::Reference(DeclarationId(773)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39580,7 +39614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -39599,7 +39633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39623,26 +39657,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6918, 7255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1254),
+            id: DeclarationId(1256),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(779)),
+                        FieldValue::Reference(DeclarationId(781)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39665,7 +39699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -39684,7 +39718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -39708,26 +39742,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7257, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1255),
+            id: DeclarationId(1257),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(780)),
+                        FieldValue::Reference(DeclarationId(782)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39749,7 +39783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -39772,26 +39806,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7600, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1256),
+            id: DeclarationId(1258),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(772)),
+                        FieldValue::Reference(DeclarationId(774)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39812,7 +39846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -39831,7 +39865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39855,26 +39889,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7874, 8185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1257),
+            id: DeclarationId(1259),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(705)),
+                        FieldValue::Reference(DeclarationId(707)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39895,7 +39929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -39914,7 +39948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -39938,26 +39972,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8187, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
+            id: DeclarationId(1260),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(707)),
+                        FieldValue::Reference(DeclarationId(709)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39978,7 +40012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -39997,7 +40031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -40016,7 +40050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -40040,26 +40074,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8505, 8914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1259),
+            id: DeclarationId(1261),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(790)),
+                        FieldValue::Reference(DeclarationId(792)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40080,7 +40114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -40099,7 +40133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -40123,26 +40157,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8916, 9232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
+            id: DeclarationId(1262),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(791)),
+                        FieldValue::Reference(DeclarationId(793)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40162,7 +40196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2171),
+                                    constructor: DeclarationId(2173),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -40185,26 +40219,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9234, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
+            id: DeclarationId(1263),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(794)),
+                        FieldValue::Reference(DeclarationId(796)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40224,7 +40258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -40247,26 +40281,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9477, 9718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
+            id: DeclarationId(1264),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(795)),
+                        FieldValue::Reference(DeclarationId(797)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40286,7 +40320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -40309,26 +40343,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9720, 9979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
+            id: DeclarationId(1265),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(796)),
+                        FieldValue::Reference(DeclarationId(798)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40349,7 +40383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -40370,7 +40404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -40394,26 +40428,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9981, 10314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
+            id: DeclarationId(1266),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(773)),
+                        FieldValue::Reference(DeclarationId(775)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40435,26 +40469,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10316, 10467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
+            id: DeclarationId(1267),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(774)),
+                        FieldValue::Reference(DeclarationId(776)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40476,26 +40510,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10469, 10617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1268),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(776)),
+                        FieldValue::Reference(DeclarationId(778)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40517,26 +40551,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10619, 10767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1269),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(777)),
+                        FieldValue::Reference(DeclarationId(779)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40558,26 +40592,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10769, 10932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1270),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(778)),
+                        FieldValue::Reference(DeclarationId(780)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40598,7 +40632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -40617,7 +40651,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -40638,7 +40672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -40659,7 +40693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -40680,7 +40714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -40701,7 +40735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -40722,7 +40756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -40743,7 +40777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -40764,7 +40798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -40783,7 +40817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -40807,26 +40841,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10934, 11951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1271),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(781)),
+                        FieldValue::Reference(DeclarationId(783)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40848,26 +40882,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11953, 12110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1272),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(782)),
+                        FieldValue::Reference(DeclarationId(784)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40889,26 +40923,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12112, 12269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1273),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(784)),
+                        FieldValue::Reference(DeclarationId(786)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40930,26 +40964,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12271, 12419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1274),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(785)),
+                        FieldValue::Reference(DeclarationId(787)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40971,26 +41005,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12421, 12578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1275),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(786)),
+                        FieldValue::Reference(DeclarationId(788)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41012,26 +41046,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12580, 12746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1276),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(787)),
+                        FieldValue::Reference(DeclarationId(789)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41053,26 +41087,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12748, 12908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1277),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(788)),
+                        FieldValue::Reference(DeclarationId(790)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41095,7 +41129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -41116,7 +41150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -41140,26 +41174,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12910, 13261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1278),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(789)),
+                        FieldValue::Reference(DeclarationId(791)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41180,7 +41214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -41201,7 +41235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41220,7 +41254,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -41239,7 +41273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -41263,26 +41297,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 13263, 13750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1279),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(797)),
+                        FieldValue::Reference(DeclarationId(799)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41304,26 +41338,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 13752, 13900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1280),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(799)),
+                        FieldValue::Reference(DeclarationId(801)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41344,7 +41378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41363,7 +41397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -41384,7 +41418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41403,7 +41437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41427,26 +41461,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 14374, 14848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1281),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(800)),
+                        FieldValue::Reference(DeclarationId(802)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41467,7 +41501,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41486,7 +41520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -41505,7 +41539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -41526,7 +41560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41545,7 +41579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41569,26 +41603,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 14850, 15415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1282),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(802)),
+                        FieldValue::Reference(DeclarationId(804)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41609,7 +41643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41628,7 +41662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -41647,7 +41681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -41668,7 +41702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41687,7 +41721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41708,7 +41742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -41732,26 +41766,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 15417, 16074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1283),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(803)),
+                        FieldValue::Reference(DeclarationId(805)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41772,7 +41806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41791,7 +41825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -41810,7 +41844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -41829,7 +41863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -41848,7 +41882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -41869,7 +41903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41888,7 +41922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41912,26 +41946,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 16076, 16778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1284),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(805)),
+                        FieldValue::Reference(DeclarationId(807)),
                     ),
                     (
                         "carrier".to_string(),
@@ -41952,7 +41986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41971,7 +42005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -41992,7 +42026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42011,7 +42045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -42030,7 +42064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42051,7 +42085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -42075,26 +42109,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 16780, 17431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1285),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(806)),
+                        FieldValue::Reference(DeclarationId(808)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42116,26 +42150,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 17433, 17577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1286),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(807)),
+                        FieldValue::Reference(DeclarationId(809)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42158,7 +42192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -42177,7 +42211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -42196,7 +42230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -42217,7 +42251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -42241,15 +42275,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 17579, 18046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1287),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42262,15 +42296,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18349, 18590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1288),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42283,15 +42317,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18592, 18746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1289),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42304,15 +42338,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18748, 19146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1290),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42325,15 +42359,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19148, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1291),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42346,15 +42380,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19459, 19861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1292),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42367,15 +42401,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19863, 20026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1293),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42388,15 +42422,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20028, 20182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1294),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42409,15 +42443,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20184, 20595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1293),
+            id: DeclarationId(1295),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42430,15 +42464,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20597, 21082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1296),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42451,15 +42485,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21084, 21490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1295),
+            id: DeclarationId(1297),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42472,15 +42506,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21492, 21910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1296),
+            id: DeclarationId(1298),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42493,15 +42527,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21912, 22075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1297),
+            id: DeclarationId(1299),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42514,15 +42548,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22077, 22240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1298),
+            id: DeclarationId(1300),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42535,28 +42569,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22242, 22396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1299),
+            id: DeclarationId(1301),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(344))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(346))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} + {rhs})".to_string())),
@@ -42572,28 +42606,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22398, 22539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1300),
+            id: DeclarationId(1302),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(345))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} - {rhs})".to_string())),
@@ -42609,28 +42643,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22541, 22682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1301),
+            id: DeclarationId(1303),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} * {rhs})".to_string())),
@@ -42646,28 +42680,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22684, 22825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1304),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
@@ -42685,28 +42719,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22827, 22975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1303),
+            id: DeclarationId(1305),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -42722,28 +42756,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22977, 23117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1304),
+            id: DeclarationId(1306),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -42759,28 +42793,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1305),
+            id: DeclarationId(1307),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -42796,28 +42830,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23268, 23415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1306),
+            id: DeclarationId(1308),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -42833,28 +42867,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23417, 23578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1307),
+            id: DeclarationId(1309),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -42870,28 +42904,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23580, 23720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1308),
+            id: DeclarationId(1310),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -42907,28 +42941,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1309),
+            id: DeclarationId(1311),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -42944,28 +42978,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23871, 24018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1312),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -42981,28 +43015,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24020, 24181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1313),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} < {rhs})".to_string())),
@@ -43018,28 +43052,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24183, 24322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1314),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} <= {rhs})".to_string())),
@@ -43055,28 +43089,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24324, 24464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1315),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(357))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} > {rhs})".to_string())),
@@ -43092,28 +43126,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24466, 24605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1316),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(358))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} >= {rhs})".to_string())),
@@ -43129,28 +43163,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24607, 24747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1317),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(366))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(368))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} && {rhs})".to_string())),
@@ -43166,28 +43200,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24749, 24898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1316),
+            id: DeclarationId(1318),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(367))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(369))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} || {rhs})".to_string())),
@@ -43203,26 +43237,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24900, 25049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1319),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1226)),
+                        FieldValue::Reference(DeclarationId(1228)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43241,26 +43275,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25051, 25184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1320),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1224)),
+                        FieldValue::Reference(DeclarationId(1226)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43279,26 +43313,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25186, 25329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1321),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1227)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43317,31 +43351,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25331, 25484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1322),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(667)),
+                        FieldValue::Reference(DeclarationId(669)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![],
                         },
                     ),
@@ -43357,31 +43391,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25486, 25624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1323),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(671)),
+                        FieldValue::Reference(DeclarationId(673)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
@@ -43395,7 +43429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2174),
+                                    constructor: DeclarationId(2176),
                                     payload: vec![],
                                 },
                             ),
@@ -43412,31 +43446,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1324),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(669)),
+                        FieldValue::Reference(DeclarationId(671)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2185),
+                            constructor: DeclarationId(2187),
                             payload: vec![],
                         },
                     ),
@@ -43451,7 +43485,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -43464,7 +43498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -43482,31 +43516,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1325),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(679)),
+                        FieldValue::Reference(DeclarationId(681)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2186),
+                            constructor: DeclarationId(2188),
                             payload: vec![],
                         },
                     ),
@@ -43521,7 +43555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -43534,7 +43568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -43552,31 +43586,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1326),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
+                        FieldValue::Reference(DeclarationId(691)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2187),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
@@ -43590,7 +43624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2173),
+                                    constructor: DeclarationId(2175),
                                     payload: vec![],
                                 },
                             ),
@@ -43607,26 +43641,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1327),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43643,22 +43677,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1328),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
@@ -43681,26 +43715,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1329),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(135)),
+                        FieldValue::Reference(DeclarationId(137)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43717,31 +43751,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1330),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(691)),
+                        FieldValue::Reference(DeclarationId(693)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2190),
                             payload: vec![],
                         },
                     ),
@@ -43755,7 +43789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2173),
+                                    constructor: DeclarationId(2175),
                                     payload: vec![],
                                 },
                             ),
@@ -43772,31 +43806,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1331),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(673)),
+                        FieldValue::Reference(DeclarationId(675)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2191),
                             payload: vec![],
                         },
                     ),
@@ -43811,7 +43845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -43824,7 +43858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -43837,7 +43871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -43855,31 +43889,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1332),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(681)),
+                        FieldValue::Reference(DeclarationId(683)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2190),
+                            constructor: DeclarationId(2192),
                             payload: vec![],
                         },
                     ),
@@ -43894,7 +43928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -43907,7 +43941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -43925,31 +43959,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1333),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(684)),
+                        FieldValue::Reference(DeclarationId(686)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2191),
+                            constructor: DeclarationId(2193),
                             payload: vec![],
                         },
                     ),
@@ -43964,7 +43998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -43977,7 +44011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -43995,31 +44029,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28233, 28456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1334),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
+                        FieldValue::Reference(DeclarationId(701)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2192),
+                            constructor: DeclarationId(2194),
                             payload: vec![],
                         },
                     ),
@@ -44034,7 +44068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -44047,7 +44081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -44065,41 +44099,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28458, 28687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1335),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1001),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1001)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2196),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1668)),
+                        FieldValue::Reference(DeclarationId(1670)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1670)),
+                        FieldValue::Reference(DeclarationId(1672)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -44132,15 +44166,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28774, 29080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1336),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1003),
+                template: DeclarationId(1005),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1003)),
+            meta_tag: Some(DeclarationId(1005)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44162,15 +44196,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29082, 29212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1337),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1004),
+                template: DeclarationId(1006),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1004)),
+            meta_tag: Some(DeclarationId(1006)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44196,15 +44230,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29214, 29374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1338),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1006),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1006)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44241,15 +44275,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29376, 29577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1339),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1007),
+                template: DeclarationId(1009),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1007)),
+            meta_tag: Some(DeclarationId(1009)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44273,15 +44307,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29579, 29689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1340),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1008),
+                template: DeclarationId(1010),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1008)),
+            meta_tag: Some(DeclarationId(1010)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44295,15 +44329,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29691, 29748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1341),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1009),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1009)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44341,15 +44375,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29750, 30035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1342),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1010),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1010)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44363,15 +44397,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 30037, 30116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1343),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1011),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1011)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44407,15 +44441,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 30118, 30341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1344),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1013),
+                template: DeclarationId(1015),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1013)),
+            meta_tag: Some(DeclarationId(1015)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44461,54 +44495,54 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 30343, 30635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1345),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1014),
+                template: DeclarationId(1016),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1014)),
+            meta_tag: Some(DeclarationId(1016)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1026)),
+                        FieldValue::Reference(DeclarationId(1028)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1027)),
+                        FieldValue::Reference(DeclarationId(1029)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1028)),
+                        FieldValue::Reference(DeclarationId(1030)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1029)),
+                        FieldValue::Reference(DeclarationId(1031)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1031)),
+                        FieldValue::Reference(DeclarationId(1033)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1034)),
+                        FieldValue::Reference(DeclarationId(1036)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1032)),
+                        FieldValue::Reference(DeclarationId(1034)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1033)),
+                        FieldValue::Reference(DeclarationId(1035)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1030)),
+                        FieldValue::Reference(DeclarationId(1032)),
                     ),
                     (
                         "filter".to_string(),
@@ -44545,15 +44579,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 30637, 31402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1346),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1015),
+                template: DeclarationId(1017),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1015)),
+            meta_tag: Some(DeclarationId(1017)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44589,15 +44623,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 31404, 31672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1347),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1012),
+                template: DeclarationId(1014),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1012)),
+            meta_tag: Some(DeclarationId(1014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44617,66 +44651,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 32429, 32544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1348),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1019),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1019)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1334)),
+                        FieldValue::Reference(DeclarationId(1336)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1335)),
+                        FieldValue::Reference(DeclarationId(1337)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1336)),
+                        FieldValue::Reference(DeclarationId(1338)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1337)),
+                        FieldValue::Reference(DeclarationId(1339)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1338)),
+                        FieldValue::Reference(DeclarationId(1340)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1339)),
+                        FieldValue::Reference(DeclarationId(1341)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1340)),
+                        FieldValue::Reference(DeclarationId(1342)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1341)),
+                        FieldValue::Reference(DeclarationId(1343)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1345)),
+                        FieldValue::Reference(DeclarationId(1347)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1342)),
+                        FieldValue::Reference(DeclarationId(1344)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1343)),
+                        FieldValue::Reference(DeclarationId(1345)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1344)),
+                        FieldValue::Reference(DeclarationId(1346)),
                     ),
                 ],
             }),
@@ -44685,15 +44719,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 32546, 32965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1349),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(902),
+                template: DeclarationId(904),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(902)),
+            meta_tag: Some(DeclarationId(904)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44721,15 +44755,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 34632, 34768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1350),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(893),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(893)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44737,55 +44771,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2019),
+                            constructor: DeclarationId(2021),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2032),
+                            constructor: DeclarationId(2034),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2034),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2040),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1347)),
+                        FieldValue::Reference(DeclarationId(1349)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -44811,7 +44845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2041),
+                                    constructor: DeclarationId(2043),
                                     payload: vec![],
                                 },
                             ),
@@ -44824,26 +44858,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 34770, 35328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1351),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(894),
+                template: DeclarationId(896),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(894)),
+            meta_tag: Some(DeclarationId(896)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1346)),
+                        FieldValue::Reference(DeclarationId(1348)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1348)),
+                        FieldValue::Reference(DeclarationId(1350)),
                     ),
                 ],
             }),
@@ -44852,15 +44886,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 35330, 35454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1352),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1003),
+                template: DeclarationId(1005),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1003)),
+            meta_tag: Some(DeclarationId(1005)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44880,15 +44914,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2347, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1353),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1004),
+                template: DeclarationId(1006),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1004)),
+            meta_tag: Some(DeclarationId(1006)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44914,15 +44948,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2471, 2624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1354),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1006),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1006)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44959,15 +44993,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2626, 2841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1355),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1007),
+                template: DeclarationId(1009),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1007)),
+            meta_tag: Some(DeclarationId(1009)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44991,15 +45025,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2843, 2957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1356),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1008),
+                template: DeclarationId(1010),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1008)),
+            meta_tag: Some(DeclarationId(1010)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45013,15 +45047,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2959, 3020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1357),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1009),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1009)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45059,15 +45093,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 3022, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1358),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1010),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1010)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45083,15 +45117,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 3331, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1359),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1011),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1011)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45131,15 +45165,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 3432, 3763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1360),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1013),
+                template: DeclarationId(1015),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1013)),
+            meta_tag: Some(DeclarationId(1015)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45185,54 +45219,54 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 3765, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1361),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1014),
+                template: DeclarationId(1016),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1014)),
+            meta_tag: Some(DeclarationId(1016)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1115)),
+                        FieldValue::Reference(DeclarationId(1117)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1116)),
+                        FieldValue::Reference(DeclarationId(1118)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1117)),
+                        FieldValue::Reference(DeclarationId(1119)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1118)),
+                        FieldValue::Reference(DeclarationId(1120)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1120)),
+                        FieldValue::Reference(DeclarationId(1122)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1123)),
+                        FieldValue::Reference(DeclarationId(1125)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1121)),
+                        FieldValue::Reference(DeclarationId(1123)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1122)),
+                        FieldValue::Reference(DeclarationId(1124)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1119)),
+                        FieldValue::Reference(DeclarationId(1121)),
                     ),
                     (
                         "filter".to_string(),
@@ -45263,15 +45297,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 4097, 4861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1362),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1015),
+                template: DeclarationId(1017),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1015)),
+            meta_tag: Some(DeclarationId(1017)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45303,15 +45337,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 4863, 5115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1363),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1012),
+                template: DeclarationId(1014),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1012)),
+            meta_tag: Some(DeclarationId(1014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45331,66 +45365,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1364),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1019),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1019)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1350)),
+                        FieldValue::Reference(DeclarationId(1352)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1351)),
+                        FieldValue::Reference(DeclarationId(1353)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1352)),
+                        FieldValue::Reference(DeclarationId(1354)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1353)),
+                        FieldValue::Reference(DeclarationId(1355)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1354)),
+                        FieldValue::Reference(DeclarationId(1356)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1355)),
+                        FieldValue::Reference(DeclarationId(1357)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1356)),
+                        FieldValue::Reference(DeclarationId(1358)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1357)),
+                        FieldValue::Reference(DeclarationId(1359)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1361)),
+                        FieldValue::Reference(DeclarationId(1363)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1358)),
+                        FieldValue::Reference(DeclarationId(1360)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1359)),
+                        FieldValue::Reference(DeclarationId(1361)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1360)),
+                        FieldValue::Reference(DeclarationId(1362)),
                     ),
                 ],
             }),
@@ -45399,15 +45433,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5439, 5914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1365),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45415,14 +45449,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2084),
+                            constructor: DeclarationId(2086),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2087),
+                            constructor: DeclarationId(2089),
                             payload: vec![],
                         },
                     ),
@@ -45433,22 +45467,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5916, 6013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1366),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(931)),
+                        FieldValue::Reference(DeclarationId(933)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -45461,15 +45495,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1367),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45482,22 +45516,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6153, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1368),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
@@ -45523,22 +45557,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6234, 6370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1369),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -45551,17 +45585,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1763),
+                                constructor: DeclarationId(1765),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1762),
+                                        constructor: DeclarationId(1764),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1760),
+                                            constructor: DeclarationId(1762),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -45573,7 +45607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1366)),
+                        FieldValue::Reference(DeclarationId(1368)),
                     ),
                 ],
             }),
@@ -45582,22 +45616,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6463, 6772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1370),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -45610,16 +45644,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1764),
+                                constructor: DeclarationId(1766),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1366)),
+                        FieldValue::Reference(DeclarationId(1368)),
                     ),
                 ],
             }),
@@ -45628,26 +45662,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6850, 7060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1371),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45669,26 +45703,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7062, 7201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1372),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45710,26 +45744,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7203, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1373),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45751,26 +45785,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7347, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1374),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45792,26 +45826,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7495, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1375),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45833,26 +45867,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7643, 7810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1376),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1228)),
+                        FieldValue::Reference(DeclarationId(1230)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45874,26 +45908,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7812, 7981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1377),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(157)),
+                        FieldValue::Reference(DeclarationId(159)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45915,26 +45949,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7983, 8142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1378),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(760)),
+                        FieldValue::Reference(DeclarationId(762)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45956,26 +45990,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8144, 8294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1379),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(789)),
+                        FieldValue::Reference(DeclarationId(791)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45997,26 +46031,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8296, 8455),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1380),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(799)),
+                        FieldValue::Reference(DeclarationId(801)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46038,26 +46072,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8457, 8613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1381),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(800)),
+                        FieldValue::Reference(DeclarationId(802)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46079,26 +46113,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8615, 8783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1382),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(802)),
+                        FieldValue::Reference(DeclarationId(804)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46120,26 +46154,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8785, 8944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1383),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(803)),
+                        FieldValue::Reference(DeclarationId(805)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46161,26 +46195,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8946, 9099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1384),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(805)),
+                        FieldValue::Reference(DeclarationId(807)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46202,26 +46236,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9101, 9254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1385),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(806)),
+                        FieldValue::Reference(DeclarationId(808)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46243,26 +46277,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9256, 9408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1386),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(807)),
+                        FieldValue::Reference(DeclarationId(809)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46284,15 +46318,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9410, 9547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1387),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46305,15 +46339,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9621, 9870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1388),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46326,15 +46360,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9872, 10034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1389),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46347,15 +46381,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 10036, 10442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1390),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46368,15 +46402,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 10444, 10761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1391),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46389,15 +46423,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 10763, 11173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1392),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46410,15 +46444,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 11175, 11346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1393),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46431,15 +46465,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 11348, 11510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1394),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46452,15 +46486,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 11512, 11931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1395),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46473,15 +46507,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 11933, 12426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1396),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46494,15 +46528,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 12428, 12842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1397),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46515,15 +46549,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 12844, 13270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1398),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46536,15 +46570,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13272, 13443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1399),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46557,15 +46591,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13445, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1400),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -46578,28 +46612,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13618, 13780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1401),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(344))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(346))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} + {rhs})".to_string())),
@@ -46615,28 +46649,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13782, 13931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1402),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(345))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} - {rhs})".to_string())),
@@ -46652,28 +46686,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13933, 14082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1403),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} * {rhs})".to_string())),
@@ -46689,28 +46723,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14084, 14233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1404),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
@@ -46728,28 +46762,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14235, 14394),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1405),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -46765,28 +46799,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14396, 14544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1406),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -46802,28 +46836,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1405),
+            id: DeclarationId(1407),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -46839,28 +46873,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1408),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -46876,28 +46910,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14860, 15029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1409),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -46913,28 +46947,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15031, 15179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1410),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} < {rhs})".to_string())),
@@ -46950,28 +46984,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15181, 15328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1411),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} <= {rhs})".to_string())),
@@ -46987,28 +47021,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15330, 15478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1412),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(357))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} > {rhs})".to_string())),
@@ -47024,28 +47058,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15480, 15627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1413),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(358))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} >= {rhs})".to_string())),
@@ -47061,28 +47095,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15629, 15777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1414),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(366))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(368))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} and {rhs})".to_string())),
@@ -47098,28 +47132,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15779, 15937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1415),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(367))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(369))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} or {rhs})".to_string())),
@@ -47135,31 +47169,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15939, 16096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1416),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(667)),
+                        FieldValue::Reference(DeclarationId(669)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![],
                         },
                     ),
@@ -47175,31 +47209,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16098, 16244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1417),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(671)),
+                        FieldValue::Reference(DeclarationId(673)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
@@ -47213,7 +47247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2174),
+                                    constructor: DeclarationId(2176),
                                     payload: vec![],
                                 },
                             ),
@@ -47230,31 +47264,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1418),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(669)),
+                        FieldValue::Reference(DeclarationId(671)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2185),
+                            constructor: DeclarationId(2187),
                             payload: vec![],
                         },
                     ),
@@ -47269,7 +47303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -47282,7 +47316,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -47300,31 +47334,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1419),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(679)),
+                        FieldValue::Reference(DeclarationId(681)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2186),
+                            constructor: DeclarationId(2188),
                             payload: vec![],
                         },
                     ),
@@ -47339,7 +47373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -47352,7 +47386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -47370,31 +47404,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1420),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
+                        FieldValue::Reference(DeclarationId(691)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2187),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
@@ -47408,7 +47442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2173),
+                                    constructor: DeclarationId(2175),
                                     payload: vec![],
                                 },
                             ),
@@ -47425,31 +47459,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1421),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(691)),
+                        FieldValue::Reference(DeclarationId(693)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2190),
                             payload: vec![],
                         },
                     ),
@@ -47463,7 +47497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2173),
+                                    constructor: DeclarationId(2175),
                                     payload: vec![],
                                 },
                             ),
@@ -47480,31 +47514,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1422),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(673)),
+                        FieldValue::Reference(DeclarationId(675)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2191),
                             payload: vec![],
                         },
                     ),
@@ -47519,7 +47553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47532,7 +47566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -47545,7 +47579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47563,31 +47597,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1423),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(681)),
+                        FieldValue::Reference(DeclarationId(683)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2190),
+                            constructor: DeclarationId(2192),
                             payload: vec![],
                         },
                     ),
@@ -47602,7 +47636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47615,7 +47649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47633,31 +47667,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1424),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(684)),
+                        FieldValue::Reference(DeclarationId(686)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2191),
+                            constructor: DeclarationId(2193),
                             payload: vec![],
                         },
                     ),
@@ -47672,7 +47706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47685,7 +47719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47703,31 +47737,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 17790, 18021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1425),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
+                        FieldValue::Reference(DeclarationId(701)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2192),
+                            constructor: DeclarationId(2194),
                             payload: vec![],
                         },
                     ),
@@ -47742,7 +47776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47755,7 +47789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -47773,26 +47807,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 18023, 18260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1426),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47808,28 +47842,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/python.dag", 18262, 18410),
         });
-        declarations.push(Declaration { id: DeclarationId(1425), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(999), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(999)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1362))), ("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(1427), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1001), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1001)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1364))), ("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(1426),
+            id: DeclarationId(1428),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(705)),
+                        FieldValue::Reference(DeclarationId(707)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47848,26 +47882,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 18855, 19029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1429),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(707)),
+                        FieldValue::Reference(DeclarationId(709)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47886,41 +47920,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 19031, 19217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1430),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1001),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1001)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2196),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1668)),
+                        FieldValue::Reference(DeclarationId(1670)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1670)),
+                        FieldValue::Reference(DeclarationId(1672)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -47953,15 +47987,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 19218, 19532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1431),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(902),
+                template: DeclarationId(904),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(902)),
+            meta_tag: Some(DeclarationId(904)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47989,15 +48023,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 21597, 21739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1432),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(893),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(893)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48005,55 +48039,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2019),
+                            constructor: DeclarationId(2021),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2026),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2027),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2032),
+                            constructor: DeclarationId(2034),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2033),
+                            constructor: DeclarationId(2035),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2040),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -48082,7 +48116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2040),
+                                    constructor: DeclarationId(2042),
                                     payload: vec![],
                                 },
                             ),
@@ -48095,26 +48129,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 21741, 22321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1433),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(894),
+                template: DeclarationId(896),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(894)),
+            meta_tag: Some(DeclarationId(896)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1362)),
+                        FieldValue::Reference(DeclarationId(1364)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1430)),
+                        FieldValue::Reference(DeclarationId(1432)),
                     ),
                 ],
             }),
@@ -48123,15 +48157,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 22323, 22459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1434),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48139,14 +48173,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2086),
+                            constructor: DeclarationId(2088),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2087),
+                            constructor: DeclarationId(2089),
                             payload: vec![],
                         },
                     ),
@@ -48157,22 +48191,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5045, 5147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1435),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(931)),
+                        FieldValue::Reference(DeclarationId(933)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -48187,15 +48221,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5149, 5301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1436),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -48208,22 +48242,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5303, 5378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1437),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48249,22 +48283,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5829, 5961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1438),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48290,22 +48324,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5963, 6098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1439),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48331,22 +48365,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6100, 6234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1440),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48372,22 +48406,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6236, 6371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1441),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48413,22 +48447,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6373, 6510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1442),
             name: Some("rust_u128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48454,22 +48488,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6802, 6940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1443),
             name: Some("rust_isize".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48495,22 +48529,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7343, 7487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1444),
             name: Some("rust_usize".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -48536,22 +48570,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7489, 7634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1445),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48564,15 +48598,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1763),
+                                constructor: DeclarationId(1765),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int("0".to_string())),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1762),
+                                        constructor: DeclarationId(1764),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1760),
+                                            constructor: DeclarationId(1762),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -48584,7 +48618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1438)),
+                        FieldValue::Reference(DeclarationId(1440)),
                     ),
                 ],
             }),
@@ -48593,22 +48627,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8055, 8354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1446),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48621,17 +48655,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1763),
+                                constructor: DeclarationId(1765),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1762),
+                                        constructor: DeclarationId(1764),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1760),
+                                            constructor: DeclarationId(1762),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -48643,7 +48677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1437)),
+                        FieldValue::Reference(DeclarationId(1439)),
                     ),
                 ],
             }),
@@ -48652,22 +48686,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8356, 8663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1447),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48680,13 +48714,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1437)),
+                        FieldValue::Reference(DeclarationId(1439)),
                     ),
                 ],
             }),
@@ -48695,22 +48729,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8665, 8870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1448),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48723,13 +48757,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1435)),
+                        FieldValue::Reference(DeclarationId(1437)),
                     ),
                 ],
             }),
@@ -48738,22 +48772,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8872, 9075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1449),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48766,13 +48800,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1439)),
+                        FieldValue::Reference(DeclarationId(1441)),
                     ),
                 ],
             }),
@@ -48781,22 +48815,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9077, 9286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1450),
             name: Some("rust_integer_inhabit_u128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48809,13 +48843,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1442)),
                     ),
                 ],
             }),
@@ -48824,22 +48858,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9711, 9922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1451),
             name: Some("rust_integer_inhabit_isize_platform".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48852,13 +48886,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1441)),
+                        FieldValue::Reference(DeclarationId(1443)),
                     ),
                 ],
             }),
@@ -48867,22 +48901,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10285, 10502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1452),
             name: Some("rust_integer_inhabit_usize_platform".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(985),
+                template: DeclarationId(987),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(985)),
+            meta_tag: Some(DeclarationId(987)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -48895,13 +48929,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1442)),
+                        FieldValue::Reference(DeclarationId(1444)),
                     ),
                 ],
             }),
@@ -48910,26 +48944,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10504, 10723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1453),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48951,26 +48985,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10725, 10860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1454),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48992,26 +49026,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10862, 11004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1455),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49033,26 +49067,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11006, 11148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1456),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49074,26 +49108,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11150, 11292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1457),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49115,26 +49149,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11294, 11457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1458),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(704)),
+                        FieldValue::Reference(DeclarationId(706)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49156,26 +49190,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11459, 11610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1459),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(758)),
+                        FieldValue::Reference(DeclarationId(760)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49195,7 +49229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -49218,26 +49252,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11612, 11857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1460),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(759)),
+                        FieldValue::Reference(DeclarationId(761)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49259,26 +49293,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11859, 12011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1461),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(760)),
+                        FieldValue::Reference(DeclarationId(762)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49299,7 +49333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -49318,7 +49352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -49339,7 +49373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -49363,26 +49397,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12013, 12409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1462),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(157)),
+                        FieldValue::Reference(DeclarationId(159)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49403,7 +49437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -49422,7 +49456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -49441,7 +49475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -49465,26 +49499,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12411, 12809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1463),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(761)),
+                        FieldValue::Reference(DeclarationId(763)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49506,26 +49540,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12811, 12969),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1464),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(762)),
+                        FieldValue::Reference(DeclarationId(764)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49547,26 +49581,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12971, 13129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1465),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(769)),
+                        FieldValue::Reference(DeclarationId(771)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49588,26 +49622,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13131, 13304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1466),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(765)),
+                        FieldValue::Reference(DeclarationId(767)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49629,26 +49663,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13306, 13454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1467),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(763)),
+                        FieldValue::Reference(DeclarationId(765)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49672,26 +49706,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13456, 13645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1468),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(764)),
+                        FieldValue::Reference(DeclarationId(766)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49713,26 +49747,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13647, 13811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1469),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(770)),
+                        FieldValue::Reference(DeclarationId(772)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49753,7 +49787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -49772,7 +49806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -49796,26 +49830,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13813, 14115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1470),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(771)),
+                        FieldValue::Reference(DeclarationId(773)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49838,7 +49872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -49857,7 +49891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -49881,26 +49915,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14117, 14458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1471),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(779)),
+                        FieldValue::Reference(DeclarationId(781)),
                     ),
                     (
                         "carrier".to_string(),
@@ -49923,7 +49957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -49942,7 +49976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -49966,26 +50000,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14460, 14805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1472),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(780)),
+                        FieldValue::Reference(DeclarationId(782)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50007,7 +50041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -50030,26 +50064,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14807, 15083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1473),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(772)),
+                        FieldValue::Reference(DeclarationId(774)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50072,7 +50106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -50091,7 +50125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -50115,26 +50149,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15085, 15402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1474),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(705)),
+                        FieldValue::Reference(DeclarationId(707)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50155,7 +50189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -50174,7 +50208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -50198,26 +50232,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15404, 15724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1475),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(707)),
+                        FieldValue::Reference(DeclarationId(709)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50238,7 +50272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -50257,7 +50291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -50276,7 +50310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -50300,26 +50334,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15726, 16139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1476),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(792)),
+                        FieldValue::Reference(DeclarationId(794)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50339,7 +50373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2171),
+                                    constructor: DeclarationId(2173),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -50362,26 +50396,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16141, 16382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1477),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(790)),
+                        FieldValue::Reference(DeclarationId(792)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50402,7 +50436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -50421,7 +50455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -50445,26 +50479,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16384, 16704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1478),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(791)),
+                        FieldValue::Reference(DeclarationId(793)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50484,7 +50518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2171),
+                                    constructor: DeclarationId(2173),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -50507,26 +50541,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16706, 16951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1479),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(794)),
+                        FieldValue::Reference(DeclarationId(796)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50546,7 +50580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -50569,26 +50603,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16953, 17198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1480),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(795)),
+                        FieldValue::Reference(DeclarationId(797)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50608,7 +50642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2170),
+                                    constructor: DeclarationId(2172),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -50631,26 +50665,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17200, 17463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1481),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(796)),
+                        FieldValue::Reference(DeclarationId(798)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50671,7 +50705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -50692,7 +50726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -50716,26 +50750,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17465, 17802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1482),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(773)),
+                        FieldValue::Reference(DeclarationId(775)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50757,26 +50791,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17804, 17959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1483),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(774)),
+                        FieldValue::Reference(DeclarationId(776)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50798,26 +50832,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17961, 18113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1484),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(776)),
+                        FieldValue::Reference(DeclarationId(778)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50839,26 +50873,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 18115, 18267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1485),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(777)),
+                        FieldValue::Reference(DeclarationId(779)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50880,26 +50914,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 18269, 18436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1486),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(778)),
+                        FieldValue::Reference(DeclarationId(780)),
                     ),
                     (
                         "carrier".to_string(),
@@ -50920,7 +50954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -50939,7 +50973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -50960,7 +50994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -50981,7 +51015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -51002,7 +51036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -51023,7 +51057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -51044,7 +51078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -51065,7 +51099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -51086,7 +51120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -51105,7 +51139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -51129,26 +51163,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 18438, 19459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1487),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(781)),
+                        FieldValue::Reference(DeclarationId(783)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51170,26 +51204,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19461, 19622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1488),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(782)),
+                        FieldValue::Reference(DeclarationId(784)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51211,26 +51245,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19624, 19785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1489),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(784)),
+                        FieldValue::Reference(DeclarationId(786)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51252,26 +51286,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19787, 19939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1490),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(785)),
+                        FieldValue::Reference(DeclarationId(787)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51293,26 +51327,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19941, 20102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1491),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(786)),
+                        FieldValue::Reference(DeclarationId(788)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51334,26 +51368,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 20104, 20274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1492),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(787)),
+                        FieldValue::Reference(DeclarationId(789)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51375,26 +51409,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 20276, 20440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1493),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(788)),
+                        FieldValue::Reference(DeclarationId(790)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51417,7 +51451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -51438,7 +51472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -51462,26 +51496,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 20442, 20797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1494),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(789)),
+                        FieldValue::Reference(DeclarationId(791)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51502,7 +51536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -51523,7 +51557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -51542,7 +51576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -51561,7 +51595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -51585,26 +51619,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 20799, 21287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1495),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(797)),
+                        FieldValue::Reference(DeclarationId(799)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51626,26 +51660,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 21289, 21441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1496),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(799)),
+                        FieldValue::Reference(DeclarationId(801)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51666,7 +51700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51685,7 +51719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -51706,7 +51740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -51725,7 +51759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -51746,7 +51780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -51770,26 +51804,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 21443, 22216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1497),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(800)),
+                        FieldValue::Reference(DeclarationId(802)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51810,7 +51844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51829,7 +51863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -51848,7 +51882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -51869,7 +51903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -51888,7 +51922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -51912,26 +51946,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 22218, 22790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1498),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(802)),
+                        FieldValue::Reference(DeclarationId(804)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51952,7 +51986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51971,7 +52005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -51990,7 +52024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -52011,7 +52045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -52030,7 +52064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52051,7 +52085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -52075,26 +52109,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 22792, 23459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1499),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(803)),
+                        FieldValue::Reference(DeclarationId(805)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52115,7 +52149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -52134,7 +52168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -52153,7 +52187,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -52172,7 +52206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -52191,7 +52225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -52212,7 +52246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -52231,7 +52265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52255,26 +52289,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 23461, 24170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1500),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(805)),
+                        FieldValue::Reference(DeclarationId(807)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52295,7 +52329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -52314,7 +52348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52335,7 +52369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -52354,7 +52388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -52373,7 +52407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2170),
+                                        constructor: DeclarationId(2172),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52394,7 +52428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -52415,7 +52449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -52439,26 +52473,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24172, 24932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1501),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(806)),
+                        FieldValue::Reference(DeclarationId(808)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52480,26 +52514,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24934, 25082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1502),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(807)),
+                        FieldValue::Reference(DeclarationId(809)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52522,7 +52556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -52541,7 +52575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -52560,7 +52594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -52581,7 +52615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2171),
+                                        constructor: DeclarationId(2173),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -52605,15 +52639,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 25084, 25564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1503),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52626,15 +52660,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 25777, 26037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1504),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52647,15 +52681,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26039, 26212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1505),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52668,15 +52702,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26214, 26631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1506),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52689,15 +52723,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26633, 26961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1507),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52710,15 +52744,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26963, 27384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1508),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52731,15 +52765,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 27386, 27568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1509),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52752,15 +52786,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 27570, 27743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1510),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52773,15 +52807,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 27745, 28175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1511),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52794,15 +52828,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28177, 28681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1512),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52815,15 +52849,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28683, 29108),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1513),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52836,15 +52870,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29110, 29547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1514),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52857,15 +52891,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29549, 29731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1515),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52878,15 +52912,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29733, 29915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1516),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -52899,28 +52933,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29917, 30090),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1517),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(344))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(346))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} + {rhs})".to_string())),
@@ -52936,28 +52970,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30945, 31090),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1518),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(345))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} - {rhs})".to_string())),
@@ -52973,28 +53007,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31092, 31237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1519),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(347))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} * {rhs})".to_string())),
@@ -53010,28 +53044,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31239, 31384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1520),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(349))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
@@ -53049,28 +53083,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31386, 31544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1521),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -53086,28 +53120,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31994, 32138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1522),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -53123,28 +53157,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32140, 32291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1523),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -53160,28 +53194,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32293, 32444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1524),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -53197,28 +53231,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32446, 32611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1525),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(228)),
+                        FieldValue::Reference(DeclarationId(230)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(351))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())),
@@ -53234,28 +53268,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32804, 32954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1526),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -53271,28 +53305,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32956, 33100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1527),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(703)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -53308,28 +53342,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 33102, 33253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1528),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(702)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -53345,28 +53379,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 33255, 33406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1529),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(703)),
+                        FieldValue::Reference(DeclarationId(705)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(352))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())),
@@ -53382,28 +53416,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 33408, 33573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1530),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(353))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} < {rhs})".to_string())),
@@ -53419,28 +53453,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 33575, 33718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1531),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(354))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} <= {rhs})".to_string())),
@@ -53456,28 +53490,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 33720, 33864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1532),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(355))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(357))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} > {rhs})".to_string())),
@@ -53493,28 +53527,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 33866, 34009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1533),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(93)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(356))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(358))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} >= {rhs})".to_string())),
@@ -53530,28 +53564,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34011, 34155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1534),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(366))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(368))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} && {rhs})".to_string())),
@@ -53567,28 +53601,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34157, 34310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1535),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(989),
+                template: DeclarationId(991),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(989)),
+            meta_tag: Some(DeclarationId(991)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(126)),
+                        FieldValue::Reference(DeclarationId(128)),
                     ),
-                    ("op".to_string(), FieldValue::Reference(DeclarationId(367))),
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(369))),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String("({lhs} || {rhs})".to_string())),
@@ -53604,26 +53638,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34312, 34465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1536),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1226)),
+                        FieldValue::Reference(DeclarationId(1228)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53642,26 +53676,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35215, 35354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1537),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1224)),
+                        FieldValue::Reference(DeclarationId(1226)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53680,26 +53714,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35356, 35503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1538),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(990)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1227)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "carrier".to_string(),
@@ -53719,31 +53753,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35505, 35675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1539),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(667)),
+                        FieldValue::Reference(DeclarationId(669)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2185),
                             payload: vec![],
                         },
                     ),
@@ -53759,31 +53793,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37052, 37194),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1540),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(671)),
+                        FieldValue::Reference(DeclarationId(673)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
@@ -53797,7 +53831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2174),
+                                    constructor: DeclarationId(2176),
                                     payload: vec![],
                                 },
                             ),
@@ -53814,31 +53848,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37196, 37392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1541),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(669)),
+                        FieldValue::Reference(DeclarationId(671)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2185),
+                            constructor: DeclarationId(2187),
                             payload: vec![],
                         },
                     ),
@@ -53853,7 +53887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -53866,7 +53900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -53884,31 +53918,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37394, 37615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1542),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(679)),
+                        FieldValue::Reference(DeclarationId(681)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2186),
+                            constructor: DeclarationId(2188),
                             payload: vec![],
                         },
                     ),
@@ -53923,7 +53957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -53936,7 +53970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -53954,31 +53988,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37617, 37844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1543),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
+                        FieldValue::Reference(DeclarationId(691)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2187),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
@@ -53992,7 +54026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2173),
+                                    constructor: DeclarationId(2175),
                                     payload: vec![],
                                 },
                             ),
@@ -54009,26 +54043,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37846, 38033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1544),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54045,22 +54079,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38035, 38178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1545),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -54083,26 +54117,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38457, 38628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1546),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1111)),
+                        FieldValue::Reference(DeclarationId(1113)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54119,26 +54153,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38630, 38780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1547),
             name: Some("rust_witness_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(952)),
+                        FieldValue::Reference(DeclarationId(954)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54155,26 +54189,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38782, 38935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1548),
             name: Some("rust_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1096)),
+                        FieldValue::Reference(DeclarationId(1098)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54191,22 +54225,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38937, 39081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1549),
             name: Some("rust_monoid_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
@@ -54227,26 +54261,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39083, 39233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1550),
             name: Some("rust_lens_enforcement_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1100)),
+                        FieldValue::Reference(DeclarationId(1102)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54265,26 +54299,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39235, 39418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1551),
             name: Some("rust_enforceable_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1103)),
+                        FieldValue::Reference(DeclarationId(1105)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54303,26 +54337,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39420, 39603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1552),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(999),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(999)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(135)),
+                        FieldValue::Reference(DeclarationId(137)),
                     ),
                     (
                         "carrier".to_string(),
@@ -54341,31 +54375,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39605, 39755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1553),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(691)),
+                        FieldValue::Reference(DeclarationId(693)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2190),
                             payload: vec![],
                         },
                     ),
@@ -54379,7 +54413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2173),
+                                    constructor: DeclarationId(2175),
                                     payload: vec![],
                                 },
                             ),
@@ -54396,31 +54430,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39757, 39949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1554),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(673)),
+                        FieldValue::Reference(DeclarationId(675)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2191),
                             payload: vec![],
                         },
                     ),
@@ -54435,7 +54469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54448,7 +54482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2174),
+                                        constructor: DeclarationId(2176),
                                         payload: vec![],
                                     },
                                 ),
@@ -54461,7 +54495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54479,31 +54513,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39951, 40212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1555),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(681)),
+                        FieldValue::Reference(DeclarationId(683)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2190),
+                            constructor: DeclarationId(2192),
                             payload: vec![],
                         },
                     ),
@@ -54518,7 +54552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54531,7 +54565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54549,31 +54583,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40214, 40432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1556),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(684)),
+                        FieldValue::Reference(DeclarationId(686)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2191),
+                            constructor: DeclarationId(2193),
                             payload: vec![],
                         },
                     ),
@@ -54588,7 +54622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54601,7 +54635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54619,31 +54653,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40434, 40661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1557),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(991)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
+                        FieldValue::Reference(DeclarationId(701)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2192),
+                            constructor: DeclarationId(2194),
                             payload: vec![],
                         },
                     ),
@@ -54658,7 +54692,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54671,7 +54705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2173),
+                                        constructor: DeclarationId(2175),
                                         payload: vec![],
                                     },
                                 ),
@@ -54689,41 +54723,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40663, 40896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1558),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1001),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1001)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(665)),
+                        FieldValue::Reference(DeclarationId(667)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2196),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1668)),
+                        FieldValue::Reference(DeclarationId(1670)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1670)),
+                        FieldValue::Reference(DeclarationId(1672)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -54758,15 +54792,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 41124, 41428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1559),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1003),
+                template: DeclarationId(1005),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1003)),
+            meta_tag: Some(DeclarationId(1005)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54790,15 +54824,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 41430, 41568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1560),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1004),
+                template: DeclarationId(1006),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1004)),
+            meta_tag: Some(DeclarationId(1006)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54824,15 +54858,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 41570, 41723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1561),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1006),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1006)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54869,15 +54903,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 41725, 41915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1562),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1007),
+                template: DeclarationId(1009),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1007)),
+            meta_tag: Some(DeclarationId(1009)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54901,15 +54935,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 41917, 42029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1563),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1008),
+                template: DeclarationId(1010),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1008)),
+            meta_tag: Some(DeclarationId(1010)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54923,15 +54957,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42031, 42091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1564),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1009),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1009)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54969,15 +55003,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42093, 42371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1565),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1010),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1010)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54991,15 +55025,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42373, 42461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1566),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1011),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1011)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55037,15 +55071,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42463, 42765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1567),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1012),
+                template: DeclarationId(1014),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1012)),
+            meta_tag: Some(DeclarationId(1014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55069,15 +55103,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42767, 42980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1568),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1013),
+                template: DeclarationId(1015),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1013)),
+            meta_tag: Some(DeclarationId(1015)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55127,15 +55161,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42982, 43317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1569),
             name: Some("rust_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55144,7 +55178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(254)),
+                            FieldValue::Reference(DeclarationId(256)),
                         )]),
                     ),
                     (
@@ -55157,7 +55191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -55171,7 +55205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -55182,15 +55216,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 43319, 43689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1570),
             name: Some("rust_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55199,7 +55233,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(272)),
+                            FieldValue::Reference(DeclarationId(274)),
                         )]),
                     ),
                     (
@@ -55211,7 +55245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -55224,7 +55258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -55235,15 +55269,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 43691, 43985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1571),
             name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55252,7 +55286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(268)),
+                            FieldValue::Reference(DeclarationId(270)),
                         )]),
                     ),
                     (
@@ -55262,7 +55296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -55275,7 +55309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -55286,15 +55320,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44156, 44451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1572),
             name: Some("rust_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55303,7 +55337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(264)),
+                            FieldValue::Reference(DeclarationId(266)),
                         )]),
                     ),
                     (
@@ -55315,7 +55349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -55328,7 +55362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -55339,15 +55373,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44453, 44773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1573),
             name: Some("rust_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(1024),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55356,7 +55390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "dag_method".to_string(),
                         FieldValue::Record(vec![(
                             "decl".to_string(),
-                            FieldValue::Reference(DeclarationId(275)),
+                            FieldValue::Reference(DeclarationId(277)),
                         )]),
                     ),
                     (
@@ -55368,7 +55402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2201),
+                            constructor: DeclarationId(2203),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -55381,7 +55415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2200),
+                            constructor: DeclarationId(2202),
                             payload: vec![],
                         },
                     ),
@@ -55391,17 +55425,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/rust.dag", 44775, 45103),
         });
-        declarations.push(Declaration { id: DeclarationId(1572), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1014), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1567))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1568))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1569))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1570))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1138))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1141))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1139))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1140))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1571))), ("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", 45105, 45981) });
+        declarations.push(Declaration { id: DeclarationId(1574), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1016), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1569))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1570))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1571))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1572))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1140))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1143))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1141))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1142))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1573))), ("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", 45105, 45981) });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1575),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1015),
+                template: DeclarationId(1017),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1015)),
+            meta_tag: Some(DeclarationId(1017)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55437,15 +55471,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 45983, 46255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1576),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(1018),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(1018)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55453,14 +55487,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2195),
+                            constructor: DeclarationId(2197),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2197),
+                            constructor: DeclarationId(2199),
                             payload: vec![],
                         },
                     ),
@@ -55471,66 +55505,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46257, 46338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1577),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1019),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1019)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1557)),
+                        FieldValue::Reference(DeclarationId(1559)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1558)),
+                        FieldValue::Reference(DeclarationId(1560)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1559)),
+                        FieldValue::Reference(DeclarationId(1561)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1560)),
+                        FieldValue::Reference(DeclarationId(1562)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1561)),
+                        FieldValue::Reference(DeclarationId(1563)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1562)),
+                        FieldValue::Reference(DeclarationId(1564)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1563)),
+                        FieldValue::Reference(DeclarationId(1565)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1564)),
+                        FieldValue::Reference(DeclarationId(1566)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1565)),
+                        FieldValue::Reference(DeclarationId(1567)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1566)),
+                        FieldValue::Reference(DeclarationId(1568)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1572)),
+                        FieldValue::Reference(DeclarationId(1574)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1573)),
+                        FieldValue::Reference(DeclarationId(1575)),
                     ),
                 ],
             }),
@@ -55539,15 +55573,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46340, 46785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1578),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(902),
+                template: DeclarationId(904),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(902)),
+            meta_tag: Some(DeclarationId(904)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55575,15 +55609,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 48209, 48348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1579),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(893),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(893)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55591,55 +55625,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2019),
+                            constructor: DeclarationId(2021),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2028),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2031),
+                            constructor: DeclarationId(2033),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2034),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2037),
+                            constructor: DeclarationId(2039),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1576)),
+                        FieldValue::Reference(DeclarationId(1578)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -55671,7 +55705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2040),
+                                    constructor: DeclarationId(2042),
                                     payload: vec![],
                                 },
                             ),
@@ -55684,26 +55718,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 48350, 48963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1580),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(894),
+                template: DeclarationId(896),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(894)),
+            meta_tag: Some(DeclarationId(896)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1577)),
+                        FieldValue::Reference(DeclarationId(1579)),
                     ),
                 ],
             }),
@@ -55712,15 +55746,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 48965, 49095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1581),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55736,15 +55770,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50197, 50300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1582),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55760,15 +55794,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50302, 50405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1583),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55784,30 +55818,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50407, 50534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1584),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(810)),
+                        FieldValue::Reference(DeclarationId(812)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1579)),
+                        FieldValue::Reference(DeclarationId(1581)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -55816,30 +55850,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50536, 50667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1585),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(811)),
+                        FieldValue::Reference(DeclarationId(813)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1580)),
+                        FieldValue::Reference(DeclarationId(1582)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -55848,30 +55882,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50669, 50800),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1586),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(812)),
+                        FieldValue::Reference(DeclarationId(814)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1581)),
+                        FieldValue::Reference(DeclarationId(1583)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -55880,15 +55914,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50802, 50969),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1587),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55904,30 +55938,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 51480, 51609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1588),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(815)),
+                        FieldValue::Reference(DeclarationId(817)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1585)),
+                        FieldValue::Reference(DeclarationId(1587)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -55936,15 +55970,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 51611, 51778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1589),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -55960,30 +55994,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 52473, 52587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1590),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(817)),
+                        FieldValue::Reference(DeclarationId(819)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1587)),
+                        FieldValue::Reference(DeclarationId(1589)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -55992,26 +56026,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 52589, 52762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1591),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(986),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(984)),
+            meta_tag: Some(DeclarationId(986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(816)),
+                        FieldValue::Reference(DeclarationId(818)),
                     ),
                     (
                         "carrier".to_string(),
@@ -56033,15 +56067,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 53174, 53335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1592),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56057,30 +56091,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 53662, 53785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1593),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(813)),
+                        FieldValue::Reference(DeclarationId(815)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1590)),
+                        FieldValue::Reference(DeclarationId(1592)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -56089,15 +56123,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 53787, 53957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1594),
             name: Some("rust_declaration_by_name_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56113,30 +56147,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 54304, 54433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1595),
             name: Some("declaration_by_name_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(814)),
+                        FieldValue::Reference(DeclarationId(816)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1592)),
+                        FieldValue::Reference(DeclarationId(1594)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -56145,15 +56179,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 54435, 54611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1596),
             name: Some("rust_per_call_pattern_at_accessor".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(808),
+                template: DeclarationId(810),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(808)),
+            meta_tag: Some(DeclarationId(810)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56169,30 +56203,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 54831, 54951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1597),
             name: Some("per_call_pattern_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(809),
+                template: DeclarationId(811),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(809)),
+            meta_tag: Some(DeclarationId(811)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(908)),
+                        FieldValue::Reference(DeclarationId(910)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1594)),
+                        FieldValue::Reference(DeclarationId(1596)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1575)),
+                        FieldValue::Reference(DeclarationId(1577)),
                     ),
                 ],
             }),
@@ -56201,12 +56235,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 54953, 55129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1598),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -56220,21 +56254,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(1597),
+            id: DeclarationId(1599),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2473),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2474),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2475),
                     },
                 ],
             },
@@ -56249,21 +56283,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(1598),
+            id: DeclarationId(1600),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1599),
                     },
                 ],
             },
@@ -56278,17 +56312,17 @@ 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(1599),
+            id: DeclarationId(1601),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1596)),
+            meta_tag: Some(DeclarationId(1598)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56302,17 +56336,17 @@ 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(1600),
+            id: DeclarationId(1602),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1596)),
+            meta_tag: Some(DeclarationId(1598)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56326,17 +56360,17 @@ 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(1601),
+            id: DeclarationId(1603),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1596)),
+            meta_tag: Some(DeclarationId(1598)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56350,17 +56384,17 @@ 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(1602),
+            id: DeclarationId(1604),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1596)),
+            meta_tag: Some(DeclarationId(1598)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56376,17 +56410,17 @@ 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(1603),
+            id: DeclarationId(1605),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1596)),
+            meta_tag: Some(DeclarationId(1598)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56400,17 +56434,17 @@ 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(1604),
+            id: DeclarationId(1606),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "symbol".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1596)),
+            meta_tag: Some(DeclarationId(1598)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56426,31 +56460,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(1605),
+            id: DeclarationId(1607),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1598),
+                template: DeclarationId(1600),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1598)),
+            meta_tag: Some(DeclarationId(1600)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1611)),
+                        FieldValue::Reference(DeclarationId(1613)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1599)),
+                        FieldValue::Reference(DeclarationId(1601)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2471),
+                            constructor: DeclarationId(2473),
                             payload: vec![],
                         },
                     ),
@@ -56461,31 +56495,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(1606),
+            id: DeclarationId(1608),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1598),
+                template: DeclarationId(1600),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1598)),
+            meta_tag: Some(DeclarationId(1600)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1612)),
+                        FieldValue::Reference(DeclarationId(1614)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1600)),
+                        FieldValue::Reference(DeclarationId(1602)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2472),
+                            constructor: DeclarationId(2474),
                             payload: vec![],
                         },
                     ),
@@ -56496,31 +56530,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(1607),
+            id: DeclarationId(1609),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1598),
+                template: DeclarationId(1600),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1598)),
+            meta_tag: Some(DeclarationId(1600)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1613)),
+                        FieldValue::Reference(DeclarationId(1615)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1601)),
+                        FieldValue::Reference(DeclarationId(1603)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2472),
+                            constructor: DeclarationId(2474),
                             payload: vec![],
                         },
                     ),
@@ -56531,31 +56565,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(1608),
+            id: DeclarationId(1610),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1598),
+                template: DeclarationId(1600),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1598)),
+            meta_tag: Some(DeclarationId(1600)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1614)),
+                        FieldValue::Reference(DeclarationId(1616)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1602)),
+                        FieldValue::Reference(DeclarationId(1604)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2472),
+                            constructor: DeclarationId(2474),
                             payload: vec![],
                         },
                     ),
@@ -56566,31 +56600,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(1609),
+            id: DeclarationId(1611),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1598),
+                template: DeclarationId(1600),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1598)),
+            meta_tag: Some(DeclarationId(1600)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1615)),
+                        FieldValue::Reference(DeclarationId(1617)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1604)),
+                        FieldValue::Reference(DeclarationId(1606)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2472),
+                            constructor: DeclarationId(2474),
                             payload: vec![],
                         },
                     ),
@@ -56601,31 +56635,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(1610),
+            id: DeclarationId(1612),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1598),
+                template: DeclarationId(1600),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1598)),
+            meta_tag: Some(DeclarationId(1600)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1616)),
+                        FieldValue::Reference(DeclarationId(1618)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1603)),
+                        FieldValue::Reference(DeclarationId(1605)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2473),
+                            constructor: DeclarationId(2475),
                             payload: vec![],
                         },
                     ),
@@ -56636,12 +56670,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(1611),
+            id: DeclarationId(1613),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1599)),
+                inputs: vec![DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1601)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56654,12 +56688,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(1612),
+            id: DeclarationId(1614),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1600)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1602)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56672,12 +56706,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(1613),
+            id: DeclarationId(1615),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1601)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1603)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56690,12 +56724,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(1614),
+            id: DeclarationId(1616),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1602)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1604)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56708,12 +56742,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(1615),
+            id: DeclarationId(1617),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807)],
-                output: DeclarationId(807),
-                body: ArrowBody::ExternalRealization(DeclarationId(1604)),
+                inputs: vec![DeclarationId(809)],
+                output: DeclarationId(809),
+                body: ArrowBody::ExternalRealization(DeclarationId(1606)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56726,17 +56760,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(1616),
+            id: DeclarationId(1618),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(807),
-                    DeclarationId(807),
-                    DeclarationId(807),
-                    DeclarationId(1019),
+                    DeclarationId(809),
+                    DeclarationId(809),
+                    DeclarationId(809),
+                    DeclarationId(1021),
                 ],
-                output: DeclarationId(228),
-                body: ArrowBody::ExternalRealization(DeclarationId(1603)),
+                output: DeclarationId(230),
+                body: ArrowBody::ExternalRealization(DeclarationId(1605)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56749,11 +56783,11 @@ 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(1617),
+            id: DeclarationId(1619),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228), DeclarationId(1019)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1021)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
                     2533,
@@ -56771,11 +56805,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(1618),
+            id: DeclarationId(1620),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(2474),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(2476),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -56793,11 +56827,11 @@ 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(1619),
+            id: DeclarationId(1621),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(785)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(787)],
+                output: DeclarationId(230),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(579))),
             },
             type_params: vec![],
@@ -56811,11 +56845,11 @@ 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(1620),
+            id: DeclarationId(1622),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(785)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(787)],
+                output: DeclarationId(230),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(596))),
             },
             type_params: vec![],
@@ -56829,21 +56863,21 @@ 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(1621),
+            id: DeclarationId(1623),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(149),
+                        ty: DeclarationId(151),
                     },
                     Field {
                         label: "lens_file".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "generated_file".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                 ],
             },
@@ -56858,15 +56892,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1624),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56894,15 +56928,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1625),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56930,15 +56964,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2222, 2410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1626),
             name: Some("lens_cost_target_realization_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -56969,15 +57003,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2412, 2649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1627),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57005,15 +57039,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2651, 2868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1628),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57041,15 +57075,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2870, 3055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1629),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57080,15 +57114,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3057, 3286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1630),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57116,15 +57150,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3288, 3501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1631),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57152,15 +57186,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4128, 4320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1632),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57188,15 +57222,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4322, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1633),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1621),
+                template: DeclarationId(1623),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1621)),
+            meta_tag: Some(DeclarationId(1623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -57224,17 +57258,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4772, 4964),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1634),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2475),
+                        ty: DeclarationId(2477),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2476),
+                        ty: DeclarationId(2478),
                     },
                 ],
             },
@@ -57249,17 +57283,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6314, 6376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1635),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2479),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2478),
+                        ty: DeclarationId(2480),
                     },
                 ],
             },
@@ -57274,37 +57308,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6378, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1636),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2479),
+                        ty: DeclarationId(2481),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2482),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2481),
+                        ty: DeclarationId(2483),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2482),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2485),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2484),
+                        ty: DeclarationId(2486),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2485),
+                        ty: DeclarationId(2487),
                     },
                 ],
             },
@@ -57319,21 +57353,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8020, 8162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1637),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2488),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2487),
+                        ty: DeclarationId(2489),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2488),
+                        ty: DeclarationId(2490),
                     },
                 ],
             },
@@ -57348,17 +57382,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8879, 8945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1638),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2491),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2490),
+                        ty: DeclarationId(2492),
                     },
                 ],
             },
@@ -57373,94 +57407,94 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9700, 10482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1639),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1636),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1638),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2491)),
+            meta_tag: Some(DeclarationId(2493)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2475),
+                            constructor: DeclarationId(2477),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2480),
+                            constructor: DeclarationId(2482),
                             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(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2475),
+                            constructor: DeclarationId(2477),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2481),
+                            constructor: DeclarationId(2483),
                             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(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2475),
+                            constructor: DeclarationId(2477),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2482),
+                            constructor: DeclarationId(2484),
                             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(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2475),
+                            constructor: DeclarationId(2477),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2483),
+                            constructor: DeclarationId(2485),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -57469,21 +57503,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(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2475),
+                            constructor: DeclarationId(2477),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2484),
+                            constructor: DeclarationId(2486),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -57494,84 +57528,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2476),
+                            constructor: DeclarationId(2478),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2480),
+                            constructor: DeclarationId(2482),
                             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(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2476),
+                            constructor: DeclarationId(2478),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2481),
+                            constructor: DeclarationId(2483),
                             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(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2476),
+                            constructor: DeclarationId(2478),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2482),
+                            constructor: DeclarationId(2484),
                             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(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2476),
+                            constructor: DeclarationId(2478),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2483),
+                            constructor: DeclarationId(2485),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -57580,21 +57614,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2489),
+                    constructor: DeclarationId(2491),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2476),
+                            constructor: DeclarationId(2478),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2484),
+                            constructor: DeclarationId(2486),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -57603,36 +57637,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2486),
+                            constructor: DeclarationId(2488),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2490),
+                    constructor: DeclarationId(2492),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2477),
+                            constructor: DeclarationId(2479),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2479),
+                            constructor: DeclarationId(2481),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2490),
+                    constructor: DeclarationId(2492),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2478),
+                            constructor: DeclarationId(2480),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2485),
+                            constructor: DeclarationId(2487),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -57644,13 +57678,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10810, 14801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(668),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(670),
                 }],
             },
             type_params: vec![],
@@ -57664,13 +57698,13 @@ 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(1639),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(670),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(672),
                 }],
             },
             type_params: vec![],
@@ -57684,13 +57718,13 @@ 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(1640),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(670),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(672),
                 }],
             },
             type_params: vec![],
@@ -57704,13 +57738,13 @@ 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(1641),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(672),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(674),
                 }],
             },
             type_params: vec![],
@@ -57724,13 +57758,13 @@ 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(1642),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(674),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(676),
                 }],
             },
             type_params: vec![],
@@ -57744,11 +57778,11 @@ 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(1643),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(675), DeclarationId(674)],
-                output: DeclarationId(675),
+                inputs: vec![DeclarationId(677), DeclarationId(676)],
+                output: DeclarationId(677),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57762,13 +57796,13 @@ 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(1644),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(677),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(679),
                 }],
             },
             type_params: vec![],
@@ -57782,11 +57816,11 @@ 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(1645),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(677), DeclarationId(678)],
-                output: DeclarationId(678),
+                inputs: vec![DeclarationId(679), DeclarationId(680)],
+                output: DeclarationId(680),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57800,13 +57834,13 @@ 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(1646),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(680),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(682),
                 }],
             },
             type_params: vec![],
@@ -57820,13 +57854,13 @@ 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(1647),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(680),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(682),
                 }],
             },
             type_params: vec![],
@@ -57840,13 +57874,13 @@ 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(1648),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(680),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(682),
                 }],
             },
             type_params: vec![],
@@ -57860,13 +57894,13 @@ 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(1649),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(682),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(684),
                 }],
             },
             type_params: vec![],
@@ -57880,11 +57914,11 @@ 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(1650),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(682)],
-                output: DeclarationId(683),
+                inputs: vec![DeclarationId(684)],
+                output: DeclarationId(685),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57898,13 +57932,13 @@ 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(1651),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(683),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(685),
                 }],
             },
             type_params: vec![],
@@ -57918,13 +57952,13 @@ 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(1652),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(685),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(687),
                 }],
             },
             type_params: vec![],
@@ -57938,11 +57972,11 @@ 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(1653),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(685)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(687)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57956,13 +57990,13 @@ 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(1654),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(685),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(687),
                 }],
             },
             type_params: vec![],
@@ -57976,13 +58010,13 @@ 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(1655),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(687),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(689),
                 }],
             },
             type_params: vec![],
@@ -57996,13 +58030,13 @@ 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(1656),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(688),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(690),
                 }],
             },
             type_params: vec![],
@@ -58016,11 +58050,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(1657),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(687)],
-                output: DeclarationId(1656),
+                inputs: vec![DeclarationId(689)],
+                output: DeclarationId(1658),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -58034,13 +58068,13 @@ 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(1658),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(688),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(690),
                 }],
             },
             type_params: vec![],
@@ -58054,13 +58088,13 @@ 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(1659),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(690),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(692),
                 }],
             },
             type_params: vec![],
@@ -58074,13 +58108,13 @@ 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(1660),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(692),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(694),
                 }],
             },
             type_params: vec![],
@@ -58094,13 +58128,13 @@ 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(1661),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(696),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(698),
                 }],
             },
             type_params: vec![],
@@ -58114,13 +58148,13 @@ 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(1662),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
+                template: DeclarationId(695),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(694),
-                    value: DeclarationId(696),
+                    parameter: DeclarationId(696),
+                    value: DeclarationId(698),
                 }],
             },
             type_params: vec![],
@@ -58134,13 +58168,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(1663),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1662),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1664),
                 }],
             },
             type_params: vec![],
@@ -58154,13 +58188,13 @@ 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(1664),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(698),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(700),
                 }],
             },
             type_params: vec![],
@@ -58174,13 +58208,13 @@ 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(1665),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
+                template: DeclarationId(695),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(694),
-                    value: DeclarationId(698),
+                    parameter: DeclarationId(696),
+                    value: DeclarationId(700),
                 }],
             },
             type_params: vec![],
@@ -58194,13 +58228,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(1666),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1665),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1667),
                 }],
             },
             type_params: vec![],
@@ -58214,13 +58248,13 @@ 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(1667),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(700),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(702),
                 }],
             },
             type_params: vec![],
@@ -58234,7 +58268,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(1668),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58248,13 +58282,13 @@ 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(1669),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(666),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(668),
                 }],
             },
             type_params: vec![],
@@ -58268,17 +58302,17 @@ 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(1670),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "head".to_string(),
-                        ty: DeclarationId(666),
+                        ty: DeclarationId(668),
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1669),
+                        ty: DeclarationId(1671),
                     },
                 ],
             },
@@ -58293,13 +58327,13 @@ 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(1671),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(706),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(708),
                 }],
             },
             type_params: vec![],
@@ -58313,13 +58347,13 @@ 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(1672),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(708),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(710),
                 }],
             },
             type_params: vec![],
@@ -58333,11 +58367,11 @@ 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(1673),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -58352,13 +58386,13 @@ 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(1674),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -58372,13 +58406,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
+                template: DeclarationId(695),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(694),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(696),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -58392,13 +58426,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -58412,11 +58446,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1676),
+                    DeclarationId(1678),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -58431,13 +58465,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -58451,13 +58485,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -58471,11 +58505,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1679),
+                    DeclarationId(1681),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -58490,13 +58524,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -58510,11 +58544,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(196),
+                    DeclarationId(198),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -58529,11 +58563,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -58548,11 +58582,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -58567,13 +58601,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -58587,13 +58621,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(755),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(757),
                 }],
             },
             type_params: vec![],
@@ -58607,12 +58641,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -58626,12 +58660,12 @@ 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(1688),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -58645,13 +58679,13 @@ 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(1689),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(709),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(711),
                 }],
             },
             type_params: vec![],
@@ -58665,13 +58699,13 @@ 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(1690),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(709),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(711),
                 }],
             },
             type_params: vec![],
@@ -58685,12 +58719,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(1691),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1690),
+                    ty: DeclarationId(1692),
                 }],
             },
             type_params: vec![],
@@ -58704,17 +58738,17 @@ 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(1692),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segment".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -58729,12 +58763,12 @@ 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(1693),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "template".to_string(),
-                    ty: DeclarationId(710),
+                    ty: DeclarationId(712),
                 }],
             },
             type_params: vec![],
@@ -58748,21 +58782,21 @@ 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(1694),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "raw".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "segment".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -58777,7 +58811,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(1695),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58791,12 +58825,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "key_source".to_string(),
-                    ty: DeclarationId(720),
+                    ty: DeclarationId(722),
                 }],
             },
             type_params: vec![],
@@ -58810,12 +58844,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "key_source".to_string(),
-                    ty: DeclarationId(720),
+                    ty: DeclarationId(722),
                 }],
             },
             type_params: vec![],
@@ -58829,12 +58863,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cause".to_string(),
-                    ty: DeclarationId(719),
+                    ty: DeclarationId(721),
                 }],
             },
             type_params: vec![],
@@ -58848,7 +58882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58862,12 +58896,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(716),
+                    ty: DeclarationId(718),
                 }],
             },
             type_params: vec![],
@@ -58881,12 +58915,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(717),
+                    ty: DeclarationId(719),
                 }],
             },
             type_params: vec![],
@@ -58900,7 +58934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58914,12 +58948,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "method".to_string(),
-                    ty: DeclarationId(196),
+                    ty: DeclarationId(198),
                 }],
             },
             type_params: vec![],
@@ -58933,12 +58967,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -58952,12 +58986,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -58971,13 +59005,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -58991,12 +59025,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1706),
+                    ty: DeclarationId(1708),
                 }],
             },
             type_params: vec![],
@@ -59010,7 +59044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59024,7 +59058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59038,12 +59072,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -59057,12 +59091,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "effect".to_string(),
-                    ty: DeclarationId(724),
+                    ty: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -59076,17 +59110,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "method_str".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -59101,29 +59135,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "operation_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "method".to_string(),
-                        ty: DeclarationId(196),
+                        ty: DeclarationId(198),
                     },
                     Field {
                         label: "raw_path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "segment".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -59138,7 +59172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59152,13 +59186,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(792),
+                template: DeclarationId(794),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(793),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(795),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -59172,12 +59206,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1715),
+                    ty: DeclarationId(1717),
                 }],
             },
             type_params: vec![],
@@ -59191,13 +59225,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(724),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(726),
                 }],
             },
             type_params: vec![],
@@ -59211,12 +59245,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1717),
+                    ty: DeclarationId(1719),
                 }],
             },
             type_params: vec![],
@@ -59230,13 +59264,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(733),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(735),
                 }],
             },
             type_params: vec![],
@@ -59250,12 +59284,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1719),
+                    ty: DeclarationId(1721),
                 }],
             },
             type_params: vec![],
@@ -59269,12 +59303,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "body".to_string(),
-                    ty: DeclarationId(734),
+                    ty: DeclarationId(736),
                 }],
             },
             type_params: vec![],
@@ -59288,13 +59322,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(734),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(736),
                 }],
             },
             type_params: vec![],
@@ -59308,12 +59342,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1722),
+                    ty: DeclarationId(1724),
                 }],
             },
             type_params: vec![],
@@ -59327,12 +59361,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(726),
+                    ty: DeclarationId(728),
                 }],
             },
             type_params: vec![],
@@ -59346,12 +59380,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(735),
+                    ty: DeclarationId(737),
                 }],
             },
             type_params: vec![],
@@ -59365,7 +59399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59379,7 +59413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59393,7 +59427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59407,7 +59441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59421,7 +59455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59435,12 +59469,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(726),
+                    ty: DeclarationId(728),
                 }],
             },
             type_params: vec![],
@@ -59454,12 +59488,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(739),
+                    ty: DeclarationId(741),
                 }],
             },
             type_params: vec![],
@@ -59473,7 +59507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59487,12 +59521,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -59506,12 +59540,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -59525,7 +59559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59539,12 +59573,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "agreement".to_string(),
-                    ty: DeclarationId(749),
+                    ty: DeclarationId(751),
                 }],
             },
             type_params: vec![],
@@ -59558,11 +59592,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(760),
+                    DeclarationId(762),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59577,11 +59611,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(806),
+                    DeclarationId(808),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59596,11 +59630,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(806),
+                    DeclarationId(808),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59615,11 +59649,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(778),
+                    DeclarationId(780),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59634,11 +59668,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(778),
+                    DeclarationId(780),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59653,11 +59687,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(734),
+                    DeclarationId(736),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59672,13 +59706,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -59692,13 +59726,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 27728, 27749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -59712,7 +59746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 27813, 27834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59726,12 +59760,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(758),
+                    ty: DeclarationId(760),
                 }],
             },
             type_params: vec![],
@@ -59745,7 +59779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59759,11 +59793,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(701),
+                    DeclarationId(703),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59778,12 +59812,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -59797,12 +59831,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1104, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(126),
+                    ty: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -59816,12 +59850,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1123, 1136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -59835,12 +59869,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1141, 1158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -59854,12 +59888,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3291, 3311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -59873,12 +59907,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3316, 3344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -59892,12 +59926,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3349, 3383),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -59911,12 +59945,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3388, 3417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -59930,7 +59964,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3422, 3439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59944,12 +59978,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4063, 4070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(763),
+                    ty: DeclarationId(765),
                 }],
             },
             type_params: vec![],
@@ -59963,7 +59997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4075, 4125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59982,7 +60016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5689, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59996,12 +60030,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5738, 5747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(763),
+                    ty: DeclarationId(765),
                 }],
             },
             type_params: vec![],
@@ -60015,17 +60049,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5752, 5788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lower".to_string(),
-                        ty: DeclarationId(766),
+                        ty: DeclarationId(768),
                     },
                     Field {
                         label: "width".to_string(),
-                        ty: DeclarationId(764),
+                        ty: DeclarationId(766),
                     },
                 ],
             },
@@ -60040,7 +60074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6100, 6150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60054,12 +60088,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6155, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(765),
+                template: DeclarationId(767),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(766),
+                    parameter: DeclarationId(768),
                     value: DeclarationId(93),
                 }],
             },
@@ -60074,12 +60108,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6740, 6753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1765),
+                    ty: DeclarationId(1767),
                 }],
             },
             type_params: vec![],
@@ -60093,7 +60127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6728, 6754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60107,7 +60141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6759, 6776),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60126,7 +60160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7027, 7037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60140,7 +60174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7042, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60154,12 +60188,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7056, 7065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -60173,12 +60207,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7492, 7512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -60192,13 +60226,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7517, 7541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -60212,12 +60246,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7553, 7569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1773),
+                    ty: DeclarationId(1775),
                 }],
             },
             type_params: vec![],
@@ -60231,13 +60265,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7546, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(773),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(775),
                 }],
             },
             type_params: vec![],
@@ -60251,12 +60285,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7580, 7596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1775),
+                    ty: DeclarationId(1777),
                 }],
             },
             type_params: vec![],
@@ -60270,13 +60304,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7575, 7597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -60290,12 +60324,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7606, 7622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1777),
+                    ty: DeclarationId(1779),
                 }],
             },
             type_params: vec![],
@@ -60309,13 +60343,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7602, 7623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(773),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(775),
                 }],
             },
             type_params: vec![],
@@ -60329,17 +60363,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7686, 7702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "constructor".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1781),
                     },
                 ],
             },
@@ -60354,12 +60388,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7628, 7708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(157),
+                    ty: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -60373,13 +60407,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9321, 9350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -60393,12 +60427,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9385, 9401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1782),
+                    ty: DeclarationId(1784),
                 }],
             },
             type_params: vec![],
@@ -60412,12 +60446,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9355, 9403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -60431,13 +60465,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9408, 9436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(773),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(775),
                 }],
             },
             type_params: vec![],
@@ -60451,12 +60485,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9455, 9471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1785),
+                    ty: DeclarationId(1787),
                 }],
             },
             type_params: vec![],
@@ -60470,13 +60504,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9441, 9472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(772),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(774),
                 }],
             },
             type_params: vec![],
@@ -60490,12 +60524,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9490, 9506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1787),
+                    ty: DeclarationId(1789),
                 }],
             },
             type_params: vec![],
@@ -60509,12 +60543,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9477, 9507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(775),
+                    ty: DeclarationId(777),
                 }],
             },
             type_params: vec![],
@@ -60528,12 +60562,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10761, 10784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -60547,7 +60581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10789, 10823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60561,7 +60595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60575,12 +60609,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10840, 10846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(157),
+                    ty: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -60594,12 +60628,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10851, 10871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(762),
+                    ty: DeclarationId(764),
                 }],
             },
             type_params: vec![],
@@ -60613,13 +60647,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11100, 11117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(770),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(772),
                 }],
             },
             type_params: vec![],
@@ -60633,12 +60667,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11139, 11154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1795),
+                    ty: DeclarationId(1797),
                 }],
             },
             type_params: vec![],
@@ -60652,13 +60686,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11122, 11156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(770),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(772),
                 }],
             },
             type_params: vec![],
@@ -60672,12 +60706,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11178, 11193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1797),
+                    ty: DeclarationId(1799),
                 }],
             },
             type_params: vec![],
@@ -60691,13 +60725,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11161, 11195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -60711,21 +60745,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11222, 11241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "output".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(776),
+                        ty: DeclarationId(778),
                     },
                 ],
             },
@@ -60740,17 +60774,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11200, 11297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "element".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(769),
+                        ty: DeclarationId(771),
                     },
                 ],
             },
@@ -60765,13 +60799,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11302, 11380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(771),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(773),
                 }],
             },
             type_params: vec![],
@@ -60785,17 +60819,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11448, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "template".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1802),
+                        ty: DeclarationId(1804),
                     },
                 ],
             },
@@ -60810,11 +60844,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11385, 11476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -60829,13 +60863,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -60849,13 +60883,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(779),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(781),
                 }],
             },
             type_params: vec![],
@@ -60869,11 +60903,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11615, 11637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(703),
+                    DeclarationId(705),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -60888,11 +60922,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(703),
+                    DeclarationId(705),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -60907,11 +60941,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(774),
+                    DeclarationId(776),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -60926,11 +60960,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(780),
+                    DeclarationId(782),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -60945,13 +60979,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(703),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -60965,7 +60999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12874, 12893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60979,7 +61013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13174, 13177),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60993,7 +61027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13182, 13185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61007,7 +61041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13190, 13193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61021,7 +61055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13198, 13201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61035,7 +61069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13325, 13327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61049,7 +61083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13332, 13334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61063,7 +61097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13339, 13341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61077,7 +61111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13346, 13348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61091,7 +61125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13353, 13355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61105,7 +61139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13360, 13362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61119,7 +61153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14139, 14142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61133,12 +61167,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14147, 14149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(781),
+                    ty: DeclarationId(783),
                 }],
             },
             type_params: vec![],
@@ -61152,12 +61186,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14385, 14409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(782),
+                    ty: DeclarationId(784),
                 }],
             },
             type_params: vec![],
@@ -61171,12 +61205,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(784),
+                    ty: DeclarationId(786),
                 }],
             },
             type_params: vec![],
@@ -61190,12 +61224,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14443, 14461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -61209,12 +61243,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14648, 14671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field_label".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61228,12 +61262,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14676, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field_label".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -61247,12 +61281,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14737, 14791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(785),
+                    ty: DeclarationId(787),
                 }],
             },
             type_params: vec![],
@@ -61266,17 +61300,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14796, 14818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "span".to_string(),
-                        ty: DeclarationId(157),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -61291,12 +61325,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14943, 14995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -61310,11 +61344,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15000, 15030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(788),
+                    DeclarationId(790),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61329,13 +61363,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(794),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(796),
                 }],
             },
             type_params: vec![],
@@ -61349,13 +61383,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17185, 17216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(705),
+                template: DeclarationId(707),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(706),
-                    value: DeclarationId(795),
+                    parameter: DeclarationId(708),
+                    value: DeclarationId(797),
                 }],
             },
             type_params: vec![],
@@ -61369,12 +61403,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17240, 17270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "count".to_string(),
-                    ty: DeclarationId(702),
+                    ty: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -61388,17 +61422,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17893, 17922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cluster".to_string(),
-                        ty: DeclarationId(704),
+                        ty: DeclarationId(706),
                     },
                     Field {
                         label: "measure".to_string(),
-                        ty: DeclarationId(702),
+                        ty: DeclarationId(704),
                     },
                 ],
             },
@@ -61413,11 +61447,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17927, 17974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(734),
+                    DeclarationId(736),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61432,13 +61466,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(702),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -61452,7 +61486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18332, 18344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61466,13 +61500,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18585, 18594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(789),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(791),
                 }],
             },
             type_params: vec![],
@@ -61486,11 +61520,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18652, 18668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(801),
+                    DeclarationId(803),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61505,7 +61539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61519,13 +61553,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19170, 19182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(702),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -61539,11 +61573,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19260, 19272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(734),
+                    DeclarationId(736),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61558,11 +61592,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(804),
+                    DeclarationId(806),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61577,12 +61611,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(799),
+                    ty: DeclarationId(801),
                 }],
             },
             type_params: vec![],
@@ -61596,12 +61630,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19462, 19478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(800),
+                    ty: DeclarationId(802),
                 }],
             },
             type_params: vec![],
@@ -61615,12 +61649,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19483, 19507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(802),
+                    ty: DeclarationId(804),
                 }],
             },
             type_params: vec![],
@@ -61634,12 +61668,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19512, 19530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(803),
+                    ty: DeclarationId(805),
                 }],
             },
             type_params: vec![],
@@ -61653,12 +61687,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(805),
+                    ty: DeclarationId(807),
                 }],
             },
             type_params: vec![],
@@ -61672,13 +61706,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19554, 19568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(778),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(780),
                 }],
             },
             type_params: vec![],
@@ -61692,13 +61726,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19597, 19614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(806),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(808),
                 }],
             },
             type_params: vec![],
@@ -61712,13 +61746,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19624, 19638),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(760),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(762),
                 }],
             },
             type_params: vec![],
@@ -61732,13 +61766,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19648, 19661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(796),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(798),
                 }],
             },
             type_params: vec![],
@@ -61752,12 +61786,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19674, 19687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(702),
+                    ty: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -61771,7 +61805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 25770, 25788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61785,13 +61819,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 25793, 25799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(702),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(704),
                 }],
             },
             type_params: vec![],
@@ -61805,12 +61839,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 25832, 25856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1858),
+                    ty: DeclarationId(1860),
                 }],
             },
             type_params: vec![],
@@ -61824,13 +61858,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 25804, 25858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61844,13 +61878,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(1114),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61864,13 +61898,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61884,13 +61918,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61904,13 +61938,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61924,13 +61958,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61944,13 +61978,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61964,13 +61998,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -61984,13 +62018,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62004,13 +62038,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62024,13 +62058,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62044,13 +62078,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62064,13 +62098,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62084,13 +62118,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62104,13 +62138,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62124,13 +62158,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62144,13 +62178,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62164,13 +62198,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62184,13 +62218,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62204,13 +62238,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62224,13 +62258,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62244,13 +62278,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62264,13 +62298,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62284,13 +62318,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62304,7 +62338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62318,7 +62352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62332,7 +62366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62346,7 +62380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62360,7 +62394,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62374,7 +62408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62388,7 +62422,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62402,11 +62436,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(821),
+                    DeclarationId(823),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62421,11 +62455,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(822),
+                    DeclarationId(824),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62440,7 +62474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62459,11 +62493,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62478,7 +62512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62492,12 +62526,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(827),
+                    ty: DeclarationId(829),
                 }],
             },
             type_params: vec![],
@@ -62511,7 +62545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62530,12 +62564,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(824),
+                    ty: DeclarationId(826),
                 }],
             },
             type_params: vec![],
@@ -62549,17 +62583,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "var".to_string(),
-                        ty: DeclarationId(824),
+                        ty: DeclarationId(826),
                     },
                     Field {
                         label: "degree".to_string(),
-                        ty: DeclarationId(827),
+                        ty: DeclarationId(829),
                     },
                 ],
             },
@@ -62574,13 +62608,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62594,12 +62628,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1900),
+                    ty: DeclarationId(1902),
                 }],
             },
             type_params: vec![],
@@ -62613,13 +62647,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(707),
+                template: DeclarationId(709),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(708),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(710),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62633,12 +62667,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1902),
+                    ty: DeclarationId(1904),
                 }],
             },
             type_params: vec![],
@@ -62652,12 +62686,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(824),
+                    ty: DeclarationId(826),
                 }],
             },
             type_params: vec![],
@@ -62671,12 +62705,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -62690,13 +62724,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(32),
-                    value: DeclarationId(828),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62710,7 +62744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62724,7 +62758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62738,7 +62772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62752,7 +62786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62766,7 +62800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62780,12 +62814,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1155),
+                    ty: DeclarationId(1157),
                 }],
             },
             type_params: vec![],
@@ -62799,7 +62833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62813,7 +62847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62827,13 +62861,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(44),
-                    value: DeclarationId(844),
+                    value: DeclarationId(846),
                 }],
             },
             type_params: vec![],
@@ -62847,13 +62881,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(671),
+                template: DeclarationId(673),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(672),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(674),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62867,11 +62901,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(708)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(710)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -62885,18 +62919,18 @@ 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(1918),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(684),
+                template: DeclarationId(686),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(685),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(687),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1653),
-                        value: DeclarationId(835),
+                        parameter: DeclarationId(1655),
+                        value: DeclarationId(837),
                     },
                 ],
             },
@@ -62911,13 +62945,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(671),
+                template: DeclarationId(673),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(672),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(674),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -62930,60 +62964,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(1920),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(828)],
-                output: DeclarationId(828),
-                body: ArrowBody::NoBody,
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1921),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(828),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1643),
-                        value: DeclarationId(839),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
-        });
         declarations.push(Declaration {
             id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(674)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(830), DeclarationId(830)],
+                output: DeclarationId(830),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -63000,19 +62986,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(829),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1643),
-                        value: DeclarationId(865),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(1645),
+                        value: DeclarationId(841),
                     },
                 ],
             },
@@ -63024,14 +63010,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", 16911, 17021),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
             id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(674)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(831), DeclarationId(676)],
+                output: DeclarationId(831),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -63048,19 +63034,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(829),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(831),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1643),
-                        value: DeclarationId(865),
+                        parameter: DeclarationId(1645),
+                        value: DeclarationId(867),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                 ],
             },
@@ -63072,16 +63058,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/algebra.dag", 17076, 17186),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
             id: DeclarationId(1926),
             name: None,
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(831), DeclarationId(676)],
+                output: DeclarationId(831),
+                body: ArrowBody::NoBody,
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1927),
+            name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(675),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(831),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1645),
+                        value: DeclarationId(867),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 17076, 17186),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1928),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63095,13 +63129,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63115,13 +63149,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63135,13 +63169,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63155,13 +63189,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63175,13 +63209,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63195,13 +63229,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63215,13 +63249,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63235,13 +63269,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63255,13 +63289,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63275,13 +63309,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63295,11 +63329,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(829), DeclarationId(828)],
-                output: DeclarationId(829),
+                inputs: vec![DeclarationId(831), DeclarationId(830)],
+                output: DeclarationId(831),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -63313,22 +63347,22 @@ 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(1938),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(829),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(831),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1643),
-                        value: DeclarationId(865),
+                        parameter: DeclarationId(1645),
+                        value: DeclarationId(867),
                     },
                 ],
             },
@@ -63343,13 +63377,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(669),
+                template: DeclarationId(671),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(670),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(672),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63363,13 +63397,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(667),
+                template: DeclarationId(669),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(668),
-                    value: DeclarationId(828),
+                    parameter: DeclarationId(670),
+                    value: DeclarationId(830),
                 }],
             },
             type_params: vec![],
@@ -63383,11 +63417,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1883), DeclarationId(828)],
-                output: DeclarationId(1883),
+                inputs: vec![DeclarationId(1885), DeclarationId(830)],
+                output: DeclarationId(1885),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -63401,22 +63435,22 @@ 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(1942),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(673),
+                template: DeclarationId(675),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(675),
-                        value: DeclarationId(1883),
+                        parameter: DeclarationId(677),
+                        value: DeclarationId(1885),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(674),
-                        value: DeclarationId(828),
+                        parameter: DeclarationId(676),
+                        value: DeclarationId(830),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1643),
-                        value: DeclarationId(868),
+                        parameter: DeclarationId(1645),
+                        value: DeclarationId(870),
                     },
                 ],
             },
@@ -63431,13 +63465,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(872),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(874),
                 }],
             },
             type_params: vec![],
@@ -63451,11 +63485,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(112),
+                    DeclarationId(115),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63470,11 +63504,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63489,13 +63523,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1146),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -63509,13 +63543,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(876),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(878),
                 }],
             },
             type_params: vec![],
@@ -63529,12 +63563,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1947),
+                    ty: DeclarationId(1949),
                 }],
             },
             type_params: vec![],
@@ -63548,13 +63582,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(877),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(879),
                 }],
             },
             type_params: vec![],
@@ -63568,12 +63602,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1949),
+                    ty: DeclarationId(1951),
                 }],
             },
             type_params: vec![],
@@ -63587,17 +63621,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "media_type".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "base64".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -63612,12 +63646,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3042, 3107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "url".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -63631,12 +63665,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3112, 3136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -63650,12 +63684,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3160, 3188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "source".to_string(),
-                    ty: DeclarationId(873),
+                    ty: DeclarationId(875),
                 }],
             },
             type_params: vec![],
@@ -63669,12 +63703,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3193, 3229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -63688,13 +63722,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3541, 3572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(874),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(876),
                 }],
             },
             type_params: vec![],
@@ -63708,12 +63742,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3604, 3622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "blocks".to_string(),
-                    ty: DeclarationId(1956),
+                    ty: DeclarationId(1958),
                 }],
             },
             type_params: vec![],
@@ -63727,12 +63761,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3577, 3624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -63746,11 +63780,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3905, 3941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(875),
+                    DeclarationId(877),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63765,11 +63799,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(126),
+                    DeclarationId(128),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63784,21 +63818,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "tool_use_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1962),
                     },
                 ],
             },
@@ -63813,12 +63847,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3946, 4064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "text".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -63832,21 +63866,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4511, 4549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                 ],
             },
@@ -63861,7 +63895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4554, 4637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63875,7 +63909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4995, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63889,7 +63923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5007, 5016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63903,7 +63937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5021, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63917,7 +63951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5038, 5045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63931,7 +63965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5050, 5059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63945,7 +63979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5064, 5071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63959,11 +63993,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5076, 5102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63978,11 +64012,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63997,13 +64031,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document_index".to_string(),
@@ -64011,11 +64045,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1974),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -64038,11 +64072,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5342, 5485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64057,11 +64091,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64076,13 +64110,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document_index".to_string(),
@@ -64090,11 +64124,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -64117,11 +64151,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5490, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64136,11 +64170,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64155,13 +64189,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document_index".to_string(),
@@ -64169,11 +64203,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1980),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -64196,11 +64230,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5640, 5793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64215,25 +64249,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "encrypted_index".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "url".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -64248,11 +64282,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5798, 5898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64267,21 +64301,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cited_text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "source".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -64308,13 +64342,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5903, 6050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(879),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(881),
                 }],
             },
             type_params: vec![],
@@ -64328,11 +64362,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1984),
+                    DeclarationId(1986),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64347,17 +64381,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1987),
                     },
                 ],
             },
@@ -64372,17 +64406,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6629, 6711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "thinking".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "signature".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -64397,12 +64431,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6716, 6777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "redacted_data".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -64416,11 +64450,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6782, 6837),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64435,25 +64469,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1991),
                     },
                 ],
             },
@@ -64468,11 +64502,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6842, 6919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64487,25 +64521,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(881),
+                        ty: DeclarationId(883),
                     },
                     Field {
                         label: "input".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1993),
                     },
                 ],
             },
@@ -64520,11 +64554,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6924, 7024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64539,21 +64573,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "tool_use_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1995),
                     },
                 ],
             },
@@ -64568,7 +64602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7029, 7115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64582,7 +64616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7336, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64596,7 +64630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7350, 7358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64610,7 +64644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7363, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64624,7 +64658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7381, 7398),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64638,7 +64672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7403, 7426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64652,7 +64686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7431, 7450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64666,7 +64700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7455, 7473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64680,7 +64714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7478, 7485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64699,7 +64733,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64718,11 +64752,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64737,7 +64771,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64751,13 +64785,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8193, 8202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(880),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(882),
                 }],
             },
             type_params: vec![],
@@ -64771,11 +64805,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8688, 8726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64790,11 +64824,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8805, 8812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
+                    DeclarationId(130),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64809,7 +64843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8873, 8878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64823,7 +64857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64837,7 +64871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64851,7 +64885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64865,7 +64899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64879,7 +64913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64893,7 +64927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64907,13 +64941,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(891),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(893),
                 }],
             },
             type_params: vec![],
@@ -64927,7 +64961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64941,7 +64975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64955,7 +64989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64969,7 +65003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64983,7 +65017,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64997,7 +65031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65011,7 +65045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65025,7 +65059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65039,7 +65073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65053,7 +65087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65067,7 +65101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65081,7 +65115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65095,7 +65129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65109,7 +65143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65123,7 +65157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65137,7 +65171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65151,7 +65185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65165,7 +65199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65179,7 +65213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65193,7 +65227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65207,7 +65241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65221,13 +65255,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65241,7 +65275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65255,7 +65289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65269,7 +65303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65283,7 +65317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65297,11 +65331,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(907),
+                    DeclarationId(909),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65316,11 +65350,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65335,7 +65369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65354,11 +65388,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(917),
+                    DeclarationId(919),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65373,11 +65407,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(917),
+                    DeclarationId(919),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65392,12 +65426,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65411,12 +65445,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1422, 1454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "witness".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65430,12 +65464,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1459, 1495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "element".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65449,12 +65483,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1500, 1537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65468,12 +65502,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1542, 1568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65487,7 +65521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1573, 1606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65501,12 +65535,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1611, 1628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1155),
+                    ty: DeclarationId(1157),
                 }],
             },
             type_params: vec![],
@@ -65520,7 +65554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1633, 1687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65534,12 +65568,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1692, 1699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "accessor".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65553,17 +65587,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2051, 2089),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1155),
+                        ty: DeclarationId(1157),
                     },
                     Field {
                         label: "collection".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -65578,17 +65612,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2094, 2168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1155),
+                        ty: DeclarationId(1157),
                     },
                     Field {
                         label: "ring_param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -65603,17 +65637,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2173, 2248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1157),
+                        ty: DeclarationId(1159),
                     },
                     Field {
                         label: "ring_param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -65628,12 +65662,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2253, 2326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "witness".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65647,12 +65681,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2331, 2368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "element".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65666,12 +65700,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2373, 2410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "outer_collection".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -65685,7 +65719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2415, 2456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65699,7 +65733,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2461, 2477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65713,12 +65747,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2998, 3008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1155),
+                    ty: DeclarationId(1157),
                 }],
             },
             type_params: vec![],
@@ -65732,12 +65766,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3013, 3060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1157),
+                    ty: DeclarationId(1159),
                 }],
             },
             type_params: vec![],
@@ -65751,7 +65785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3065, 3116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65765,7 +65799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3306, 3310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65779,7 +65813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3315, 3322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65793,11 +65827,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3327, 3333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(909),
+                    DeclarationId(911),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -65812,7 +65846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65826,7 +65860,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7270, 7281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65840,7 +65874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7330, 7344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65854,7 +65888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7409, 7425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65868,7 +65902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65882,7 +65916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65896,7 +65930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65910,7 +65944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65924,7 +65958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65938,7 +65972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65952,7 +65986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65966,7 +66000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65980,7 +66014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65994,7 +66028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66008,7 +66042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66022,7 +66056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66036,7 +66070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66050,13 +66084,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66070,13 +66104,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66090,7 +66124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66104,7 +66138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66118,12 +66152,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66137,7 +66171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66151,7 +66185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66165,18 +66199,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(933),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(935),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(936),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(938),
                     },
                 ],
             },
@@ -66191,7 +66225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66205,7 +66239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5539, 5543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66219,7 +66253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5546, 5552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66233,7 +66267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5555, 5557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66247,7 +66281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6373, 6377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66261,7 +66295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6380, 6384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66275,7 +66309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6387, 6391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66289,7 +66323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6394, 6399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66303,7 +66337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6402, 6413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66317,7 +66351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6416, 6429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66331,7 +66365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7009, 7014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66345,7 +66379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7017, 7026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66359,7 +66393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7029, 7035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66373,7 +66407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7038, 7042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66387,13 +66421,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7045, 7049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(942),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(944),
                 }],
             },
             type_params: vec![],
@@ -66407,13 +66441,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8443, 8461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(943),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(945),
                 }],
             },
             type_params: vec![],
@@ -66427,7 +66461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8916, 8944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66441,7 +66475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1022, 1036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66455,7 +66489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1041, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66469,7 +66503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1056, 1068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66483,7 +66517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66497,7 +66531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1091, 1103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66511,7 +66545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1108, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66525,7 +66559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66539,7 +66573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1152, 1171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66553,7 +66587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1176, 1201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66567,12 +66601,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1206, 1229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(945),
+                    ty: DeclarationId(947),
                 }],
             },
             type_params: vec![],
@@ -66586,12 +66620,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5429, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(948),
+                    ty: DeclarationId(950),
                 }],
             },
             type_params: vec![],
@@ -66605,13 +66639,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5470, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(946),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -66625,12 +66659,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5970, 5986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "unspecified_axis".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66644,7 +66678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9098, 9139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66658,13 +66692,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9436, 9448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66678,17 +66712,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9718, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2130),
                     },
                 ],
             },
@@ -66703,12 +66737,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9675, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "construct".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66722,12 +66756,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10042, 10076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "detail".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -66741,7 +66775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10479, 10530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66755,21 +66789,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10873, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "connective".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "behavior".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -66784,13 +66818,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11241, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(971),
+                    value: DeclarationId(973),
                 }],
             },
             type_params: vec![],
@@ -66804,18 +66838,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(970),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(972),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(971),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(973),
                     },
                 ],
             },
@@ -66830,18 +66864,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(970),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(972),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(971),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(973),
                     },
                 ],
             },
@@ -66856,18 +66890,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(970),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(972),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(971),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(973),
                     },
                 ],
             },
@@ -66882,13 +66916,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(974),
+                    value: DeclarationId(976),
                 }],
             },
             type_params: vec![],
@@ -66902,18 +66936,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(973),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(975),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(974),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(976),
                     },
                 ],
             },
@@ -66928,18 +66962,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(973),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(975),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(974),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(976),
                     },
                 ],
             },
@@ -66954,18 +66988,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(973),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(975),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(974),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(976),
                     },
                 ],
             },
@@ -66980,13 +67014,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(977),
+                    value: DeclarationId(979),
                 }],
             },
             type_params: vec![],
@@ -67000,18 +67034,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(976),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(978),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(977),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(979),
                     },
                 ],
             },
@@ -67026,18 +67060,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(976),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(978),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(977),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(979),
                     },
                 ],
             },
@@ -67052,13 +67086,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(980),
+                    value: DeclarationId(982),
                 }],
             },
             type_params: vec![],
@@ -67072,18 +67106,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(979),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(981),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(980),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(982),
                     },
                 ],
             },
@@ -67098,18 +67132,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(961),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(960),
-                        value: DeclarationId(979),
+                        parameter: DeclarationId(962),
+                        value: DeclarationId(981),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(961),
-                        value: DeclarationId(980),
+                        parameter: DeclarationId(963),
+                        value: DeclarationId(982),
                     },
                 ],
             },
@@ -67124,12 +67158,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(953),
+                    ty: DeclarationId(955),
                 }],
             },
             type_params: vec![],
@@ -67143,17 +67177,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "reason".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "at".to_string(),
-                        ty: DeclarationId(806),
+                        ty: DeclarationId(808),
                     },
                 ],
             },
@@ -67168,7 +67202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67182,12 +67216,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(950),
+                    ty: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -67201,13 +67235,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(956),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(958),
                 }],
             },
             type_params: vec![],
@@ -67221,13 +67255,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2152),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2154),
                 }],
             },
             type_params: vec![],
@@ -67241,21 +67275,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimension_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "composed".to_string(),
-                        ty: DeclarationId(956),
+                        ty: DeclarationId(958),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2155),
                     },
                 ],
             },
@@ -67270,13 +67304,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(950),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -67290,13 +67324,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(956),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(958),
                 }],
             },
             type_params: vec![],
@@ -67310,13 +67344,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2156),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2158),
                 }],
             },
             type_params: vec![],
@@ -67330,21 +67364,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimension_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2159),
                     },
                 ],
             },
@@ -67359,13 +67393,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(958),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(960),
                 }],
             },
             type_params: vec![],
@@ -67379,11 +67413,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(806)],
-                output: DeclarationId(2159),
+                inputs: vec![DeclarationId(809), DeclarationId(808)],
+                output: DeclarationId(2161),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -67397,13 +67431,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(958),
+                    value: DeclarationId(960),
                 }],
             },
             type_params: vec![],
@@ -67417,11 +67451,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(806), DeclarationId(958)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(808), DeclarationId(960)],
+                output: DeclarationId(956),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -67435,13 +67469,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2165),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(960),
+                    value: DeclarationId(962),
                 }],
             },
             type_params: vec![],
@@ -67455,7 +67489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67469,12 +67503,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(157),
+                    ty: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -67488,13 +67522,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(987),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(989),
                 }],
             },
             type_params: vec![],
@@ -67508,7 +67542,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67522,12 +67556,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(767),
+                    ty: DeclarationId(769),
                 }],
             },
             type_params: vec![],
@@ -67541,7 +67575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67555,12 +67589,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -67574,12 +67608,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -67593,13 +67627,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(992),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(994),
                 }],
             },
             type_params: vec![],
@@ -67613,7 +67647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67627,7 +67661,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67641,7 +67675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67655,7 +67689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67669,7 +67703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67683,7 +67717,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67697,7 +67731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67711,7 +67745,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67725,7 +67759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67739,7 +67773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67753,7 +67787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67767,7 +67801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67781,7 +67815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67795,7 +67829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67809,7 +67843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67823,7 +67857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67837,7 +67871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67851,7 +67885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67865,7 +67899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67879,7 +67913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67893,7 +67927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67907,7 +67941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67921,7 +67955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67935,7 +67969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67949,7 +67983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67963,7 +67997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67977,7 +68011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67991,7 +68025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68005,12 +68039,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "template".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68024,17 +68058,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inline_template".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "fn_ref_template".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -68049,13 +68083,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
@@ -68069,11 +68103,11 @@ 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(2204),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(907),
+                    DeclarationId(909),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -68088,11 +68122,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(911),
+                    DeclarationId(913),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -68107,13 +68141,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1053),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1055),
                 }],
             },
             type_params: vec![],
@@ -68127,13 +68161,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -68147,13 +68181,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -68167,13 +68201,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -68187,13 +68221,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2209),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2211),
                 }],
             },
             type_params: vec![],
@@ -68207,7 +68241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68226,7 +68260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68245,7 +68279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68264,7 +68298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68283,7 +68317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68302,7 +68336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68321,7 +68355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68335,7 +68369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68349,7 +68383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68363,7 +68397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68377,7 +68411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68391,17 +68425,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field".to_string(),
-                        ty: DeclarationId(1037),
+                        ty: DeclarationId(1039),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(909),
+                        ty: DeclarationId(911),
                     },
                 ],
             },
@@ -68416,12 +68450,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(1037),
+                    ty: DeclarationId(1039),
                 }],
             },
             type_params: vec![],
@@ -68435,17 +68469,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(909),
+                        ty: DeclarationId(911),
                     },
                 ],
             },
@@ -68460,7 +68494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68474,7 +68508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68488,7 +68522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68502,12 +68536,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1155),
+                    ty: DeclarationId(1157),
                 }],
             },
             type_params: vec![],
@@ -68521,17 +68555,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "numerator".to_string(),
-                        ty: DeclarationId(1155),
+                        ty: DeclarationId(1157),
                     },
                     Field {
                         label: "root".to_string(),
-                        ty: DeclarationId(1155),
+                        ty: DeclarationId(1157),
                     },
                 ],
             },
@@ -68546,17 +68580,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1157),
+                        ty: DeclarationId(1159),
                     },
                     Field {
                         label: "argument".to_string(),
-                        ty: DeclarationId(1155),
+                        ty: DeclarationId(1157),
                     },
                 ],
             },
@@ -68571,17 +68605,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "exponent".to_string(),
-                        ty: DeclarationId(1050),
+                        ty: DeclarationId(1052),
                     },
                 ],
             },
@@ -68596,12 +68630,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68615,7 +68649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68629,12 +68663,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cost".to_string(),
-                    ty: DeclarationId(1052),
+                    ty: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -68648,13 +68682,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -68668,12 +68702,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2235),
+                    ty: DeclarationId(2237),
                 }],
             },
             type_params: vec![],
@@ -68687,13 +68721,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1052),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -68707,13 +68741,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(2237),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(2239),
                 }],
             },
             type_params: vec![],
@@ -68727,12 +68761,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2238),
+                    ty: DeclarationId(2240),
                 }],
             },
             type_params: vec![],
@@ -68746,13 +68780,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1053),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1055),
                 }],
             },
             type_params: vec![],
@@ -68766,12 +68800,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2240),
+                    ty: DeclarationId(2242),
                 }],
             },
             type_params: vec![],
@@ -68785,7 +68819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68799,7 +68833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68813,13 +68847,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -68833,13 +68867,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -68853,13 +68887,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1097),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1099),
                 }],
             },
             type_params: vec![],
@@ -68873,11 +68907,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(806)],
-                output: DeclarationId(2246),
+                inputs: vec![DeclarationId(809), DeclarationId(808)],
+                output: DeclarationId(2248),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -68891,13 +68925,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(1097),
+                    value: DeclarationId(1099),
                 }],
             },
             type_params: vec![],
@@ -68911,11 +68945,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1097), DeclarationId(1097)],
-                output: DeclarationId(1097),
+                inputs: vec![DeclarationId(1099), DeclarationId(1099)],
+                output: DeclarationId(1099),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -68929,11 +68963,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1097), DeclarationId(797)],
-                output: DeclarationId(1097),
+                inputs: vec![DeclarationId(1099), DeclarationId(799)],
+                output: DeclarationId(1099),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -68947,11 +68981,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(807), DeclarationId(1097)],
-                output: DeclarationId(954),
+                inputs: vec![DeclarationId(809), DeclarationId(1099)],
+                output: DeclarationId(956),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -68965,12 +68999,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "declaration".to_string(),
-                    ty: DeclarationId(703),
+                    ty: DeclarationId(705),
                 }],
             },
             type_params: vec![],
@@ -68984,17 +69018,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "declaration".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(701),
+                        ty: DeclarationId(703),
                     },
                 ],
             },
@@ -69009,7 +69043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69023,11 +69057,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1101)],
-                output: DeclarationId(1102),
+                inputs: vec![DeclarationId(1103)],
+                output: DeclarationId(1104),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -69041,11 +69075,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1102), DeclarationId(1102)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(1104), DeclarationId(1104)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -69059,13 +69093,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1096),
+                template: DeclarationId(1098),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1097),
-                    value: DeclarationId(1104),
+                    parameter: DeclarationId(1099),
+                    value: DeclarationId(1106),
                 }],
             },
             type_params: vec![],
@@ -69079,18 +69113,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1100),
+                template: DeclarationId(1102),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(1101),
-                        value: DeclarationId(1104),
+                        parameter: DeclarationId(1103),
+                        value: DeclarationId(1106),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1102),
-                        value: DeclarationId(1105),
+                        parameter: DeclarationId(1104),
+                        value: DeclarationId(1107),
                     },
                 ],
             },
@@ -69105,18 +69139,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1103),
+                template: DeclarationId(1105),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(1104),
-                        value: DeclarationId(1107),
+                        parameter: DeclarationId(1106),
+                        value: DeclarationId(1109),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1105),
-                        value: DeclarationId(1108),
+                        parameter: DeclarationId(1107),
+                        value: DeclarationId(1110),
                     },
                 ],
             },
@@ -69131,13 +69165,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1096),
+                template: DeclarationId(1098),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1097),
-                    value: DeclarationId(1110),
+                    parameter: DeclarationId(1099),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -69151,12 +69185,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
+                    parameter: DeclarationId(1114),
                     value: DeclarationId(93),
                 }],
             },
@@ -69171,12 +69205,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1111),
+                template: DeclarationId(1113),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1112),
+                    parameter: DeclarationId(1114),
                     value: DeclarationId(93),
                 }],
             },
@@ -69191,7 +69225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69205,12 +69239,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1112),
+                    ty: DeclarationId(1114),
                 }],
             },
             type_params: vec![],
@@ -69224,13 +69258,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
@@ -69248,13 +69282,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1128),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1130),
                 }],
             },
             type_params: vec![],
@@ -69268,12 +69302,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(761),
+                    ty: DeclarationId(763),
                 }],
             },
             type_params: vec![],
@@ -69287,13 +69321,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1127),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1129),
                 }],
             },
             type_params: vec![],
@@ -69307,12 +69341,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2268),
+                    ty: DeclarationId(2270),
                 }],
             },
             type_params: vec![],
@@ -69326,17 +69360,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "tag".to_string(),
-                        ty: DeclarationId(703),
+                        ty: DeclarationId(705),
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1128),
+                        ty: DeclarationId(1130),
                     },
                 ],
             },
@@ -69351,12 +69385,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(701),
+                    ty: DeclarationId(703),
                 }],
             },
             type_params: vec![],
@@ -69370,12 +69404,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(797),
+                    ty: DeclarationId(799),
                 }],
             },
             type_params: vec![],
@@ -69389,18 +69423,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(702),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(704),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1128),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1130),
                     },
                 ],
             },
@@ -69415,13 +69449,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1131),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1133),
                 }],
             },
             type_params: vec![],
@@ -69435,12 +69469,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "input_order".to_string(),
-                    ty: DeclarationId(1135),
+                    ty: DeclarationId(1137),
                 }],
             },
             type_params: vec![],
@@ -69454,7 +69488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69468,7 +69502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69482,13 +69516,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1022),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1024),
                 }],
             },
             type_params: vec![],
@@ -69502,18 +69536,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5765, 5793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1143),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1145),
                     },
                 ],
             },
@@ -69528,11 +69562,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6801, 6824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1147),
+                    DeclarationId(1149),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -69547,11 +69581,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1147),
+                    DeclarationId(1149),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -69566,11 +69600,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1147),
+                    DeclarationId(1149),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -69585,18 +69619,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1147),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1149),
                     },
                 ],
             },
@@ -69611,18 +69645,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1147),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1149),
                     },
                 ],
             },
@@ -69637,11 +69671,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1155),
+                    DeclarationId(1157),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -69656,11 +69690,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1157),
+                    DeclarationId(1159),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -69675,18 +69709,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(12),
-                        value: DeclarationId(1168),
+                        value: DeclarationId(1170),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(13),
-                        value: DeclarationId(1167),
+                        value: DeclarationId(1169),
                     },
                 ],
             },
@@ -69701,7 +69735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69715,7 +69749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69729,7 +69763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69743,12 +69777,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69762,12 +69796,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69781,12 +69815,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69800,12 +69834,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69819,12 +69853,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "param".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69838,7 +69872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69852,12 +69886,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(1155),
+                    ty: DeclarationId(1157),
                 }],
             },
             type_params: vec![],
@@ -69871,7 +69905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69885,12 +69919,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inner".to_string(),
-                    ty: DeclarationId(1157),
+                    ty: DeclarationId(1159),
                 }],
             },
             type_params: vec![],
@@ -69904,12 +69938,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "accessor".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69923,12 +69957,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "amount".to_string(),
-                    ty: DeclarationId(1155),
+                    ty: DeclarationId(1157),
                 }],
             },
             type_params: vec![],
@@ -69942,12 +69976,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1155),
+                    ty: DeclarationId(1157),
                 }],
             },
             type_params: vec![],
@@ -69961,12 +69995,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1157),
+                    ty: DeclarationId(1159),
                 }],
             },
             type_params: vec![],
@@ -69980,12 +70014,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "witness".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69999,12 +70033,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "element".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70018,7 +70052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70032,13 +70066,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1154),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1156),
                 }],
             },
             type_params: vec![],
@@ -70052,13 +70086,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1147),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1149),
                 }],
             },
             type_params: vec![],
@@ -70072,7 +70106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70086,7 +70120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70100,7 +70134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70114,12 +70148,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1166),
+                    ty: DeclarationId(1168),
                 }],
             },
             type_params: vec![],
@@ -70133,7 +70167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70147,18 +70181,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(1165),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1167),
                     },
                 ],
             },
@@ -70173,13 +70207,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(946),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -70193,13 +70227,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(952),
+                template: DeclarationId(954),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70213,12 +70247,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "duration".to_string(),
-                    ty: DeclarationId(1171),
+                    ty: DeclarationId(1173),
                 }],
             },
             type_params: vec![],
@@ -70232,7 +70266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4004, 4038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70246,7 +70280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4043, 4053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70260,7 +70294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4058, 4067),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70273,54 +70307,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4072, 4077),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2321),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1175),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: 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", 5915, 5943),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2322),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1668),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(946),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1177),
                 }],
             },
             type_params: vec![],
@@ -70331,16 +70325,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/timing_lens.dag", 11855, 11881),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 5915, 5943),
         });
         declarations.push(Declaration {
             id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(1670),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -70351,16 +70345,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/timing_lens.dag", 11855, 11881),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962),
         });
         declarations.push(Declaration {
             id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70377,10 +70371,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70397,10 +70391,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70417,10 +70411,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70437,10 +70431,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70457,10 +70451,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70477,10 +70471,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70497,10 +70491,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2148),
+                template: DeclarationId(2150),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(953),
-                    value: DeclarationId(1172),
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
                 }],
             },
             type_params: vec![],
@@ -70516,6 +70510,46 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2333),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2150),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 11855, 11881),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2334),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2150),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(955),
+                    value: DeclarationId(1174),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 11855, 11881),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2335),
+            name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -70528,7 +70562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70542,7 +70576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70556,7 +70590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70570,7 +70604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70584,7 +70618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70598,7 +70632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70612,7 +70646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70626,7 +70660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70640,7 +70674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70654,7 +70688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70668,7 +70702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70682,7 +70716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70696,12 +70730,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70715,12 +70749,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70734,12 +70768,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70753,7 +70787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70767,7 +70801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70781,7 +70815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70795,7 +70829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70809,7 +70843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70823,7 +70857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70837,7 +70871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70851,7 +70885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70865,7 +70899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70879,7 +70913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70893,7 +70927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70907,7 +70941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70921,7 +70955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70935,7 +70969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70949,7 +70983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70963,7 +70997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70977,7 +71011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70991,7 +71025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71005,7 +71039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71019,7 +71053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71033,7 +71067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71047,7 +71081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71061,7 +71095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71075,7 +71109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71089,7 +71123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71103,7 +71137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71117,7 +71151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71131,7 +71165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71145,7 +71179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71159,7 +71193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71173,7 +71207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71187,7 +71221,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71201,7 +71235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71215,7 +71249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71229,7 +71263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71243,7 +71277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71257,7 +71291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71271,7 +71305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71285,7 +71319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71299,7 +71333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71313,7 +71347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71327,7 +71361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71341,7 +71375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71355,7 +71389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71369,7 +71403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71383,7 +71417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71397,7 +71431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71411,7 +71445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71425,7 +71459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71439,7 +71473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71453,7 +71487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2399),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71467,7 +71501,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71481,7 +71515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71495,7 +71529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71509,7 +71543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71523,7 +71557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71537,7 +71571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71551,7 +71585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71565,7 +71599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71579,7 +71613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71593,7 +71627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71607,7 +71641,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71621,7 +71655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71635,7 +71669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2412),
+            id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71649,7 +71683,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2413),
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71663,7 +71697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2414),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71677,7 +71711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71691,7 +71725,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2416),
+            id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71705,7 +71739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2417),
+            id: DeclarationId(2419),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71719,7 +71753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2418),
+            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71733,13 +71767,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2419),
+            id: DeclarationId(2421),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1126),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1128),
                 }],
             },
             type_params: vec![],
@@ -71753,13 +71787,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17652, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2420),
+            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1215),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1217),
                 }],
             },
             type_params: vec![],
@@ -71773,13 +71807,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17877, 17892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2421),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1217),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1219),
                 }],
             },
             type_params: vec![],
@@ -71793,7 +71827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17897, 17917),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2422),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71807,7 +71841,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71821,7 +71855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71835,7 +71869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71849,7 +71883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71863,7 +71897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71877,7 +71911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71891,7 +71925,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71905,7 +71939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71919,7 +71953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71933,7 +71967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71947,12 +71981,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -71966,7 +72000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71980,7 +72014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71994,7 +72028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72008,7 +72042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4030, 4042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72022,7 +72056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4857, 4870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72036,7 +72070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4875, 4888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72050,7 +72084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4893, 4901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72064,12 +72098,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4926, 4934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1208),
+                    ty: DeclarationId(1210),
                 }],
             },
             type_params: vec![],
@@ -72083,12 +72117,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4939, 4979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72102,17 +72136,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4984, 5017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "bind_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1209),
+                        ty: DeclarationId(1211),
                     },
                 ],
             },
@@ -72127,12 +72161,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5022, 5100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "declaration_name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72146,17 +72180,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5266, 5329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "bind_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(782),
+                        ty: DeclarationId(784),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -72175,21 +72209,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5334, 5425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72204,17 +72238,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5430, 5562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72229,13 +72263,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5777, 5866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72249,17 +72283,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6666, 6678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -72278,13 +72312,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6615, 6712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72298,17 +72332,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7412, 7424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -72327,21 +72361,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7362, 7458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72356,21 +72390,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7756, 7878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72385,12 +72419,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 8140, 8265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1228),
+                    ty: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -72404,21 +72438,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10318, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(1210),
+                        ty: DeclarationId(1212),
                     },
                     Field {
                         label: "baseline_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72433,17 +72467,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10733, 10865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72458,17 +72492,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11432, 11544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1211),
+                        ty: DeclarationId(1213),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72483,17 +72517,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12241, 12320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1199),
+                        ty: DeclarationId(1201),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -72512,21 +72546,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12540, 12653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1199),
+                        ty: DeclarationId(1201),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72541,17 +72575,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12658, 12794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1197),
+                        ty: DeclarationId(1199),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1198),
+                        ty: DeclarationId(1200),
                     },
                 ],
             },
@@ -72566,17 +72600,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12799, 12881),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72591,13 +72625,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12886, 12972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1197),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1199),
                 }],
             },
             type_params: vec![],
@@ -72611,17 +72645,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13051, 13061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2464),
                     },
                 ],
             },
@@ -72636,21 +72670,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12977, 13067),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72665,21 +72699,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14009, 14143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -72694,12 +72728,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14782, 14926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
-                    ty: DeclarationId(890),
+                    ty: DeclarationId(892),
                 }],
             },
             type_params: vec![],
@@ -72713,13 +72747,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15771, 15825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1126),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1128),
                 }],
             },
             type_params: vec![],
@@ -72733,13 +72767,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16869, 16892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1215),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1217),
                 }],
             },
             type_params: vec![],
@@ -72753,13 +72787,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16938, 16953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1126),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1128),
                 }],
             },
             type_params: vec![],
@@ -72773,13 +72807,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17209, 17232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(806),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(808),
                 }],
             },
             type_params: vec![],
@@ -72793,7 +72827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72807,7 +72841,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(2472),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72821,7 +72855,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(2473),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72835,11 +72869,11 @@ 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(2474),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(785),
+                    DeclarationId(787),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -72854,7 +72888,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(2475),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72868,7 +72902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6338, 6356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72882,7 +72916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6361, 6376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72896,7 +72930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6405, 6426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72910,7 +72944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6431, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72924,7 +72958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8043, 8053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72938,7 +72972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8058, 8069),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72952,7 +72986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8074, 8087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72966,7 +73000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8092, 8105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72980,7 +73014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8110, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72994,7 +73028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8128, 8142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73008,7 +73042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8147, 8162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73022,7 +73056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8904, 8921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73036,7 +73070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8926, 8936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73050,37 +73084,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8941, 8945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1632),
+                        ty: DeclarationId(1634),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1634),
+                        ty: DeclarationId(1636),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "range_max_inclusive".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "is_copy".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1635),
+                        ty: DeclarationId(1637),
                     },
                 ],
             },
@@ -73095,25 +73129,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9723, 10295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "target_name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1633),
+                        ty: DeclarationId(1635),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1634),
+                        ty: DeclarationId(1636),
                     },
                     Field {
                         label: "is_copy".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -73128,13 +73162,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10300, 10482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(665),
+                template: DeclarationId(667),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(666),
-                    value: DeclarationId(1636),
+                    parameter: DeclarationId(668),
+                    value: DeclarationId(1638),
                 }],
             },
             type_params: vec![],
@@ -73422,7 +73456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(33),
             Port {
                 id: PortId(33),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(797))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(799))),
                 produced_by: None,
             },
         );
@@ -73462,7 +73496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(38),
             Port {
                 id: PortId(38),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(702))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(704))),
                 produced_by: Some(NodeId(35)),
             },
         );
@@ -73470,7 +73504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(39),
             Port {
                 id: PortId(39),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -73478,7 +73512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(40),
             Port {
                 id: PortId(40),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -73486,7 +73520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(41),
             Port {
                 id: PortId(41),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(702))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(704))),
                 produced_by: Some(NodeId(37)),
             },
         );
@@ -73494,7 +73528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(42),
             Port {
                 id: PortId(42),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(702))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(704))),
                 produced_by: Some(NodeId(38)),
             },
         );
@@ -73502,7 +73536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(43),
             Port {
                 id: PortId(43),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(39)),
             },
         );
@@ -73510,7 +73544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(44),
             Port {
                 id: PortId(44),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73526,7 +73560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(46),
             Port {
                 id: PortId(46),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: Some(NodeId(42)),
             },
         );
@@ -73534,7 +73568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(47),
             Port {
                 id: PortId(47),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73542,7 +73576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(48),
             Port {
                 id: PortId(48),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73566,7 +73600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(51),
             Port {
                 id: PortId(51),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1862))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1864))),
                 produced_by: Some(NodeId(46)),
             },
         );
@@ -73574,7 +73608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(52),
             Port {
                 id: PortId(52),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73582,7 +73616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(53),
             Port {
                 id: PortId(53),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73590,7 +73624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(54),
             Port {
                 id: PortId(54),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1863))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1865))),
                 produced_by: None,
             },
         );
@@ -73598,7 +73632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(55),
             Port {
                 id: PortId(55),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1864))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1866))),
                 produced_by: Some(NodeId(48)),
             },
         );
@@ -73606,7 +73640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(56),
             Port {
                 id: PortId(56),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73646,7 +73680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(61),
             Port {
                 id: PortId(61),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(53)),
             },
         );
@@ -73654,7 +73688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(62),
             Port {
                 id: PortId(62),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
                 produced_by: None,
             },
         );
@@ -73726,7 +73760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(71),
             Port {
                 id: PortId(71),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73734,7 +73768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(72),
             Port {
                 id: PortId(72),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73758,7 +73792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(75),
             Port {
                 id: PortId(75),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(65)),
             },
         );
@@ -73766,7 +73800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(76),
             Port {
                 id: PortId(76),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73774,7 +73808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(77),
             Port {
                 id: PortId(77),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73798,7 +73832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(80),
             Port {
                 id: PortId(80),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(69)),
             },
         );
@@ -73806,7 +73840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(81),
             Port {
                 id: PortId(81),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73814,7 +73848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(82),
             Port {
                 id: PortId(82),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73838,7 +73872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(85),
             Port {
                 id: PortId(85),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(73)),
             },
         );
@@ -73846,7 +73880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(86),
             Port {
                 id: PortId(86),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73854,7 +73888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(87),
             Port {
                 id: PortId(87),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73878,7 +73912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(90),
             Port {
                 id: PortId(90),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(77)),
             },
         );
@@ -73886,7 +73920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(91),
             Port {
                 id: PortId(91),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1867))),
                 produced_by: None,
             },
         );
@@ -73910,7 +73944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(94),
             Port {
                 id: PortId(94),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(81)),
             },
         );
@@ -73918,7 +73952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(95),
             Port {
                 id: PortId(95),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -73926,7 +73960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(96),
             Port {
                 id: PortId(96),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -74622,7 +74656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(183),
             Port {
                 id: PortId(183),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(134)),
             },
         );
@@ -74630,7 +74664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(184),
             Port {
                 id: PortId(184),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -74638,7 +74672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(185),
             Port {
                 id: PortId(185),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -74646,7 +74680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(186),
             Port {
                 id: PortId(186),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(136)),
             },
         );
@@ -74654,7 +74688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(187),
             Port {
                 id: PortId(187),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -74662,7 +74696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(188),
             Port {
                 id: PortId(188),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -75278,7 +75312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(265),
             Port {
                 id: PortId(265),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(206)),
             },
         );
@@ -75286,7 +75320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(266),
             Port {
                 id: PortId(266),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -75294,7 +75328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(267),
             Port {
                 id: PortId(267),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -75310,7 +75344,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(269),
             Port {
                 id: PortId(269),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: Some(NodeId(209)),
             },
         );
@@ -75318,7 +75352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(270),
             Port {
                 id: PortId(270),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -75326,7 +75360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(271),
             Port {
                 id: PortId(271),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: None,
             },
         );
@@ -75342,7 +75376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(273),
             Port {
                 id: PortId(273),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(844))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(846))),
                 produced_by: Some(NodeId(212)),
             },
         );
@@ -75350,7 +75384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(274),
             Port {
                 id: PortId(274),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -75430,7 +75464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(284),
             Port {
                 id: PortId(284),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(221)),
             },
         );
@@ -75438,7 +75472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(285),
             Port {
                 id: PortId(285),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1866))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1868))),
                 produced_by: None,
             },
         );
@@ -75446,7 +75480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(286),
             Port {
                 id: PortId(286),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(223)),
             },
         );
@@ -75454,7 +75488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(287),
             Port {
                 id: PortId(287),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(224)),
             },
         );
@@ -75462,7 +75496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(288),
             Port {
                 id: PortId(288),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1863))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1865))),
                 produced_by: Some(NodeId(225)),
             },
         );
@@ -75478,7 +75512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(290),
             Port {
                 id: PortId(290),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1867))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1869))),
                 produced_by: Some(NodeId(227)),
             },
         );
@@ -75486,7 +75520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(291),
             Port {
                 id: PortId(291),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1868))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1870))),
                 produced_by: None,
             },
         );
@@ -75590,7 +75624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(304),
             Port {
                 id: PortId(304),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1869))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1871))),
                 produced_by: Some(NodeId(240)),
             },
         );
@@ -75598,7 +75632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(305),
             Port {
                 id: PortId(305),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1870))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1872))),
                 produced_by: None,
             },
         );
@@ -75646,7 +75680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(311),
             Port {
                 id: PortId(311),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1871))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1873))),
                 produced_by: Some(NodeId(247)),
             },
         );
@@ -75654,7 +75688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(312),
             Port {
                 id: PortId(312),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1872))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1874))),
                 produced_by: None,
             },
         );
@@ -75726,7 +75760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(321),
             Port {
                 id: PortId(321),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(256)),
             },
         );
@@ -75734,7 +75768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(322),
             Port {
                 id: PortId(322),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1873))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1875))),
                 produced_by: None,
             },
         );
@@ -75838,7 +75872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(335),
             Port {
                 id: PortId(335),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1874))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1876))),
                 produced_by: Some(NodeId(269)),
             },
         );
@@ -75846,7 +75880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(336),
             Port {
                 id: PortId(336),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -75974,7 +76008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(352),
             Port {
                 id: PortId(352),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(279)),
             },
         );
@@ -75982,7 +76016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(353),
             Port {
                 id: PortId(353),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76110,7 +76144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(369),
             Port {
                 id: PortId(369),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(289)),
             },
         );
@@ -76118,7 +76152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(370),
             Port {
                 id: PortId(370),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1875))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1877))),
                 produced_by: None,
             },
         );
@@ -76222,7 +76256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(383),
             Port {
                 id: PortId(383),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(301)),
             },
         );
@@ -76230,7 +76264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(384),
             Port {
                 id: PortId(384),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1876))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1878))),
                 produced_by: None,
             },
         );
@@ -76334,7 +76368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(397),
             Port {
                 id: PortId(397),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(313)),
             },
         );
@@ -76342,7 +76376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(398),
             Port {
                 id: PortId(398),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1877))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1879))),
                 produced_by: None,
             },
         );
@@ -76494,7 +76528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(417),
             Port {
                 id: PortId(417),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(330)),
             },
         );
@@ -76502,7 +76536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(418),
             Port {
                 id: PortId(418),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76510,7 +76544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(419),
             Port {
                 id: PortId(419),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76630,7 +76664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(434),
             Port {
                 id: PortId(434),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(339)),
             },
         );
@@ -76638,7 +76672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(435),
             Port {
                 id: PortId(435),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -76646,7 +76680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(436),
             Port {
                 id: PortId(436),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76654,7 +76688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(437),
             Port {
                 id: PortId(437),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76774,7 +76808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(452),
             Port {
                 id: PortId(452),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(348)),
             },
         );
@@ -76782,7 +76816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(453),
             Port {
                 id: PortId(453),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -76790,7 +76824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(454),
             Port {
                 id: PortId(454),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(824))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(826))),
                 produced_by: None,
             },
         );
@@ -76798,7 +76832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(455),
             Port {
                 id: PortId(455),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76806,7 +76840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(456),
             Port {
                 id: PortId(456),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76838,7 +76872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(353)),
             },
         );
@@ -76846,7 +76880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(461),
             Port {
                 id: PortId(461),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76854,7 +76888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(462),
             Port {
                 id: PortId(462),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76870,7 +76904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(464),
             Port {
                 id: PortId(464),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(356)),
             },
         );
@@ -76878,7 +76912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(465),
             Port {
                 id: PortId(465),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: None,
             },
         );
@@ -76886,7 +76920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(466),
             Port {
                 id: PortId(466),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -76894,7 +76928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(467),
             Port {
                 id: PortId(467),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(358)),
             },
         );
@@ -76902,7 +76936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(468),
             Port {
                 id: PortId(468),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(359)),
             },
         );
@@ -76926,7 +76960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(471),
             Port {
                 id: PortId(471),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(362)),
             },
         );
@@ -76934,7 +76968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(472),
             Port {
                 id: PortId(472),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -76942,7 +76976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(829))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(831))),
                 produced_by: None,
             },
         );
@@ -76950,7 +76984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(474),
             Port {
                 id: PortId(474),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -76958,7 +76992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(475),
             Port {
                 id: PortId(475),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1878))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1880))),
                 produced_by: None,
             },
         );
@@ -76966,7 +77000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(476),
             Port {
                 id: PortId(476),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -77070,7 +77104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(489),
             Port {
                 id: PortId(489),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1879))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1881))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -77078,7 +77112,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(490),
             Port {
                 id: PortId(490),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1880))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1882))),
                 produced_by: None,
             },
         );
@@ -77086,7 +77120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(491),
             Port {
                 id: PortId(491),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: None,
             },
         );
@@ -77134,7 +77168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(497),
             Port {
                 id: PortId(497),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1881))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1883))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -77142,7 +77176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(498),
             Port {
                 id: PortId(498),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1882))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1884))),
                 produced_by: None,
             },
         );
@@ -77158,7 +77192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(500),
             Port {
                 id: PortId(500),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1883))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1885))),
                 produced_by: Some(NodeId(388)),
             },
         );
@@ -77166,7 +77200,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(501),
             Port {
                 id: PortId(501),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1053))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1055))),
                 produced_by: None,
             },
         );
@@ -77326,7 +77360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(521),
             Port {
                 id: PortId(521),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(405)),
             },
         );
@@ -77334,7 +77368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1052))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1054))),
                 produced_by: None,
             },
         );
@@ -77414,7 +77448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(532),
             Port {
                 id: PortId(532),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(414)),
             },
         );
@@ -77422,7 +77456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(533),
             Port {
                 id: PortId(533),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2208))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2210))),
                 produced_by: None,
             },
         );
@@ -77430,7 +77464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(534),
             Port {
                 id: PortId(534),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(830))),
                 produced_by: Some(NodeId(416)),
             },
         );
@@ -77438,7 +77472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(535),
             Port {
                 id: PortId(535),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(156))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(158))),
                 produced_by: Some(NodeId(418)),
             },
         );
@@ -77446,7 +77480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: Some(NodeId(420)),
             },
         );
@@ -77454,7 +77488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(537),
             Port {
                 id: PortId(537),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -77462,7 +77496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(538),
             Port {
                 id: PortId(538),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -77470,7 +77504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(539),
             Port {
                 id: PortId(539),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: None,
             },
         );
@@ -77750,7 +77784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(574),
             Port {
                 id: PortId(574),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: Some(NodeId(452)),
             },
         );
@@ -77758,7 +77792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(575),
             Port {
                 id: PortId(575),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -77766,7 +77800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(576),
             Port {
                 id: PortId(576),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -77782,7 +77816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(578),
             Port {
                 id: PortId(578),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: Some(NodeId(455)),
             },
         );
@@ -77798,7 +77832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(580),
             Port {
                 id: PortId(580),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1171))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1173))),
                 produced_by: Some(NodeId(458)),
             },
         );
@@ -77814,7 +77848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(582),
             Port {
                 id: PortId(582),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: Some(NodeId(461)),
             },
         );
@@ -77822,7 +77856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(583),
             Port {
                 id: PortId(583),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -77830,7 +77864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(584),
             Port {
                 id: PortId(584),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -77846,7 +77880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(586),
             Port {
                 id: PortId(586),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: Some(NodeId(464)),
             },
         );
@@ -77854,7 +77888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(587),
             Port {
                 id: PortId(587),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2315))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2317))),
                 produced_by: Some(NodeId(466)),
             },
         );
@@ -77862,7 +77896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(588),
             Port {
                 id: PortId(588),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(808))),
                 produced_by: None,
             },
         );
@@ -77950,7 +77984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(599),
             Port {
                 id: PortId(599),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(157))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: Some(NodeId(473)),
             },
         );
@@ -77958,7 +77992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(600),
             Port {
                 id: PortId(600),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: None,
             },
         );
@@ -77966,7 +78000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(601),
             Port {
                 id: PortId(601),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(157))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: None,
             },
         );
@@ -77998,7 +78032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(605),
             Port {
                 id: PortId(605),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(950))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(952))),
                 produced_by: Some(NodeId(478)),
             },
         );
@@ -78030,7 +78064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(609),
             Port {
                 id: PortId(609),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(157))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: Some(NodeId(483)),
             },
         );
@@ -78038,7 +78072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(610),
             Port {
                 id: PortId(610),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -78046,7 +78080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(611),
             Port {
                 id: PortId(611),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: None,
             },
         );
@@ -78062,7 +78096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1852))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1854))),
                 produced_by: Some(NodeId(486)),
             },
         );
@@ -78182,7 +78216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(954))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(956))),
                 produced_by: Some(NodeId(499)),
             },
         );
@@ -78190,7 +78224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(629),
             Port {
                 id: PortId(629),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -78198,7 +78232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(630),
             Port {
                 id: PortId(630),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(797))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(799))),
                 produced_by: None,
             },
         );
@@ -78286,7 +78320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(641),
             Port {
                 id: PortId(641),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: Some(NodeId(508)),
             },
         );
@@ -78294,7 +78328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(642),
             Port {
                 id: PortId(642),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -78302,7 +78336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(643),
             Port {
                 id: PortId(643),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(808))),
                 produced_by: None,
             },
         );
@@ -78630,7 +78664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(684),
             Port {
                 id: PortId(684),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2316))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2318))),
                 produced_by: Some(NodeId(545)),
             },
         );
@@ -78638,7 +78672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(685),
             Port {
                 id: PortId(685),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -78646,7 +78680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(686),
             Port {
                 id: PortId(686),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1172))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1174))),
                 produced_by: None,
             },
         );
@@ -78758,7 +78792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(700),
             Port {
                 id: PortId(700),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(954))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(956))),
                 produced_by: Some(NodeId(559)),
             },
         );
@@ -78766,7 +78800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(701),
             Port {
                 id: PortId(701),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(807))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(809))),
                 produced_by: None,
             },
         );
@@ -78774,7 +78808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(702),
             Port {
                 id: PortId(702),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2470))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2472))),
                 produced_by: Some(NodeId(561)),
             },
         );
@@ -78782,7 +78816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(703),
             Port {
                 id: PortId(703),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(785))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(787))),
                 produced_by: None,
             },
         );
@@ -78934,7 +78968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(722),
             Port {
                 id: PortId(722),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: Some(NodeId(578)),
             },
         );
@@ -78942,7 +78976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(723),
             Port {
                 id: PortId(723),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(785))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(787))),
                 produced_by: None,
             },
         );
@@ -79094,7 +79128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(742),
             Port {
                 id: PortId(742),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(228))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: Some(NodeId(595)),
             },
         );
diff --git a/src/v3/compiler/src/bootstrap_std_generated.rs b/src/v3/compiler/src/bootstrap_std_generated.rs
index 45405a8754b..d366e29c2fe 100644
--- a/src/v3/compiler/src/bootstrap_std_generated.rs
+++ b/src/v3/compiler/src/bootstrap_std_generated.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_std_fixture_dag() -> Dag {
         ports: bootstrapped_std_fixture_dag_ports(),
         diagnostics: bootstrapped_std_fixture_dag_diagnostics(),
         next_node_id: 33,
-        next_declaration_id: 665,
+        next_declaration_id: 667,
         next_port_id: 33,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_std_fixture_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_std_fixture_dag_clusters(),
         optional_match_disjs: bootstrapped_std_fixture_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 665,
+        declaration_append_begin_after_bootstrap: 667,
     }
 }
 
@@ -286,7 +286,7 @@ fn bootstrapped_std_fixture_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(665);
+        let mut declarations = Vec::with_capacity(667);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -294,11 +294,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "True".to_string(),
-                        ty: DeclarationId(308),
+                        ty: DeclarationId(310),
                     },
                     Field {
                         label: "False".to_string(),
-                        ty: DeclarationId(309),
+                        ty: DeclarationId(311),
                     },
                 ],
             },
@@ -389,7 +389,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bits".to_string(),
-                    ty: DeclarationId(310),
+                    ty: DeclarationId(312),
                 }],
             },
             type_params: vec![],
@@ -408,7 +408,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bits".to_string(),
-                    ty: DeclarationId(311),
+                    ty: DeclarationId(313),
                 }],
             },
             type_params: vec![],
@@ -427,7 +427,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(312),
+                    ty: DeclarationId(314),
                 }],
             },
             type_params: vec![],
@@ -446,7 +446,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(313),
+                    ty: DeclarationId(315),
                 }],
             },
             type_params: vec![],
@@ -465,7 +465,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(314),
+                    ty: DeclarationId(316),
                 }],
             },
             type_params: vec![],
@@ -484,7 +484,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bytes".to_string(),
-                    ty: DeclarationId(315),
+                    ty: DeclarationId(317),
                 }],
             },
             type_params: vec![],
@@ -504,11 +504,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Ok".to_string(),
-                        ty: DeclarationId(316),
+                        ty: DeclarationId(318),
                     },
                     Field {
                         label: "Err".to_string(),
-                        ty: DeclarationId(317),
+                        ty: DeclarationId(319),
                     },
                 ],
             },
@@ -557,11 +557,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByZero".to_string(),
-                        ty: DeclarationId(318),
+                        ty: DeclarationId(320),
                     },
                     Field {
                         label: "Overflow".to_string(),
-                        ty: DeclarationId(319),
+                        ty: DeclarationId(321),
                     },
                 ],
             },
@@ -581,7 +581,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "op".to_string(),
-                    ty: DeclarationId(329),
+                    ty: DeclarationId(331),
                 }],
             },
             type_params: vec![DeclarationId(16)],
@@ -614,7 +614,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "op".to_string(),
-                    ty: DeclarationId(330),
+                    ty: DeclarationId(332),
                 }],
             },
             type_params: vec![DeclarationId(18)],
@@ -648,7 +648,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(331),
+                        ty: DeclarationId(333),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -687,7 +687,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(332),
+                        ty: DeclarationId(334),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -726,7 +726,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(333),
+                        ty: DeclarationId(335),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -734,7 +734,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inverse".to_string(),
-                        ty: DeclarationId(334),
+                        ty: DeclarationId(336),
                     },
                 ],
             },
@@ -769,7 +769,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(335),
+                        ty: DeclarationId(337),
                     },
                     Field {
                         label: "identity".to_string(),
@@ -777,7 +777,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inverse".to_string(),
-                        ty: DeclarationId(336),
+                        ty: DeclarationId(338),
                     },
                 ],
             },
@@ -868,7 +868,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(337),
+                        ty: DeclarationId(339),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -876,7 +876,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(338),
+                        ty: DeclarationId(340),
                     },
                     Field {
                         label: "one".to_string(),
@@ -915,7 +915,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(339),
+                        ty: DeclarationId(341),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -923,7 +923,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(340),
+                        ty: DeclarationId(342),
                     },
                     Field {
                         label: "one".to_string(),
@@ -962,7 +962,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(341),
+                        ty: DeclarationId(343),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -970,11 +970,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(342),
+                        ty: DeclarationId(344),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(343),
+                        ty: DeclarationId(345),
                     },
                     Field {
                         label: "one".to_string(),
@@ -1013,11 +1013,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(344),
+                        ty: DeclarationId(346),
                     },
                     Field {
                         label: "sub".to_string(),
-                        ty: DeclarationId(345),
+                        ty: DeclarationId(347),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -1025,15 +1025,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(346),
+                        ty: DeclarationId(348),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(347),
+                        ty: DeclarationId(349),
                     },
                     Field {
                         label: "div".to_string(),
-                        ty: DeclarationId(349),
+                        ty: DeclarationId(351),
                     },
                     Field {
                         label: "one".to_string(),
@@ -1041,31 +1041,31 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "compare".to_string(),
-                        ty: DeclarationId(350),
+                        ty: DeclarationId(352),
                     },
                     Field {
                         label: "eq".to_string(),
-                        ty: DeclarationId(351),
+                        ty: DeclarationId(353),
                     },
                     Field {
                         label: "ne".to_string(),
-                        ty: DeclarationId(352),
+                        ty: DeclarationId(354),
                     },
                     Field {
                         label: "lt".to_string(),
-                        ty: DeclarationId(353),
+                        ty: DeclarationId(355),
                     },
                     Field {
                         label: "le".to_string(),
-                        ty: DeclarationId(354),
+                        ty: DeclarationId(356),
                     },
                     Field {
                         label: "gt".to_string(),
-                        ty: DeclarationId(355),
+                        ty: DeclarationId(357),
                     },
                     Field {
                         label: "ge".to_string(),
-                        ty: DeclarationId(356),
+                        ty: DeclarationId(358),
                     },
                 ],
             },
@@ -1100,7 +1100,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "add".to_string(),
-                        ty: DeclarationId(357),
+                        ty: DeclarationId(359),
                     },
                     Field {
                         label: "zero".to_string(),
@@ -1108,11 +1108,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "negate".to_string(),
-                        ty: DeclarationId(358),
+                        ty: DeclarationId(360),
                     },
                     Field {
                         label: "mul".to_string(),
-                        ty: DeclarationId(359),
+                        ty: DeclarationId(361),
                     },
                     Field {
                         label: "one".to_string(),
@@ -1120,11 +1120,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "reciprocal".to_string(),
-                        ty: DeclarationId(360),
+                        ty: DeclarationId(362),
                     },
                     Field {
                         label: "compare".to_string(),
-                        ty: DeclarationId(361),
+                        ty: DeclarationId(363),
                     },
                 ],
             },
@@ -1159,11 +1159,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(362),
+                        ty: DeclarationId(364),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(363),
+                        ty: DeclarationId(365),
                     },
                 ],
             },
@@ -1198,11 +1198,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(364),
+                        ty: DeclarationId(366),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(365),
+                        ty: DeclarationId(367),
                     },
                     Field {
                         label: "top".to_string(),
@@ -1245,15 +1245,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "meet".to_string(),
-                        ty: DeclarationId(366),
+                        ty: DeclarationId(368),
                     },
                     Field {
                         label: "join".to_string(),
-                        ty: DeclarationId(367),
+                        ty: DeclarationId(369),
                     },
                     Field {
                         label: "complement".to_string(),
-                        ty: DeclarationId(368),
+                        ty: DeclarationId(370),
                     },
                     Field {
                         label: "top".to_string(),
@@ -1296,87 +1296,87 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "concat".to_string(),
-                        ty: DeclarationId(372),
+                        ty: DeclarationId(374),
                     },
                     Field {
                         label: "empty".to_string(),
-                        ty: DeclarationId(373),
+                        ty: DeclarationId(375),
                     },
                     Field {
                         label: "append".to_string(),
-                        ty: DeclarationId(375),
+                        ty: DeclarationId(377),
                     },
                     Field {
                         label: "slice".to_string(),
-                        ty: DeclarationId(377),
+                        ty: DeclarationId(379),
                     },
                     Field {
                         label: "length".to_string(),
-                        ty: DeclarationId(378),
+                        ty: DeclarationId(380),
                     },
                     Field {
                         label: "is_empty".to_string(),
-                        ty: DeclarationId(379),
+                        ty: DeclarationId(381),
                     },
                     Field {
                         label: "count".to_string(),
-                        ty: DeclarationId(380),
+                        ty: DeclarationId(382),
                     },
                     Field {
                         label: "first".to_string(),
-                        ty: DeclarationId(382),
+                        ty: DeclarationId(384),
                     },
                     Field {
                         label: "last".to_string(),
-                        ty: DeclarationId(384),
+                        ty: DeclarationId(386),
                     },
                     Field {
                         label: "map".to_string(),
-                        ty: DeclarationId(387),
+                        ty: DeclarationId(389),
                     },
                     Field {
                         label: "filter".to_string(),
-                        ty: DeclarationId(390),
+                        ty: DeclarationId(392),
                     },
                     Field {
                         label: "fold".to_string(),
-                        ty: DeclarationId(392),
+                        ty: DeclarationId(394),
                     },
                     Field {
                         label: "flat_map".to_string(),
-                        ty: DeclarationId(396),
+                        ty: DeclarationId(398),
                     },
                     Field {
                         label: "any".to_string(),
-                        ty: DeclarationId(398),
+                        ty: DeclarationId(400),
                     },
                     Field {
                         label: "all".to_string(),
-                        ty: DeclarationId(400),
+                        ty: DeclarationId(402),
                     },
                     Field {
                         label: "enumerate".to_string(),
-                        ty: DeclarationId(404),
+                        ty: DeclarationId(406),
                     },
                     Field {
                         label: "reverse".to_string(),
-                        ty: DeclarationId(406),
+                        ty: DeclarationId(408),
                     },
                     Field {
                         label: "skip".to_string(),
-                        ty: DeclarationId(408),
+                        ty: DeclarationId(410),
                     },
                     Field {
                         label: "take".to_string(),
-                        ty: DeclarationId(410),
+                        ty: DeclarationId(412),
                     },
                     Field {
                         label: "sort_by".to_string(),
-                        ty: DeclarationId(413),
+                        ty: DeclarationId(415),
                     },
                     Field {
                         label: "contains".to_string(),
-                        ty: DeclarationId(414),
+                        ty: DeclarationId(416),
                     },
                 ],
             },
@@ -1411,43 +1411,43 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lookup".to_string(),
-                        ty: DeclarationId(416),
+                        ty: DeclarationId(418),
                     },
                     Field {
                         label: "empty".to_string(),
-                        ty: DeclarationId(417),
+                        ty: DeclarationId(419),
                     },
                     Field {
                         label: "get".to_string(),
-                        ty: DeclarationId(419),
+                        ty: DeclarationId(421),
                     },
                     Field {
                         label: "insert".to_string(),
-                        ty: DeclarationId(421),
+                        ty: DeclarationId(423),
                     },
                     Field {
                         label: "merge".to_string(),
-                        ty: DeclarationId(424),
+                        ty: DeclarationId(426),
                     },
                     Field {
                         label: "keys".to_string(),
-                        ty: DeclarationId(426),
+                        ty: DeclarationId(428),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(428),
+                        ty: DeclarationId(430),
                     },
                     Field {
                         label: "has".to_string(),
-                        ty: DeclarationId(429),
+                        ty: DeclarationId(431),
                     },
                     Field {
                         label: "contains_key".to_string(),
-                        ty: DeclarationId(430),
+                        ty: DeclarationId(432),
                     },
                     Field {
                         label: "size".to_string(),
-                        ty: DeclarationId(431),
+                        ty: DeclarationId(433),
                     },
                 ],
             },
@@ -1496,15 +1496,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Less".to_string(),
-                        ty: DeclarationId(432),
+                        ty: DeclarationId(434),
                     },
                     Field {
                         label: "Equal".to_string(),
-                        ty: DeclarationId(433),
+                        ty: DeclarationId(435),
                     },
                     Field {
                         label: "Greater".to_string(),
-                        ty: DeclarationId(434),
+                        ty: DeclarationId(436),
                     },
                 ],
             },
@@ -1525,31 +1525,31 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OrderedRingProfile".to_string(),
-                        ty: DeclarationId(435),
+                        ty: DeclarationId(437),
                     },
                     Field {
                         label: "ApproximateFieldProfile".to_string(),
-                        ty: DeclarationId(436),
+                        ty: DeclarationId(438),
                     },
                     Field {
                         label: "BooleanAlgebraProfile".to_string(),
-                        ty: DeclarationId(437),
+                        ty: DeclarationId(439),
                     },
                     Field {
                         label: "BooleanAlgebraCollectionProfile".to_string(),
-                        ty: DeclarationId(438),
+                        ty: DeclarationId(440),
                     },
                     Field {
                         label: "FreeMonoidScalarProfile".to_string(),
-                        ty: DeclarationId(439),
+                        ty: DeclarationId(441),
                     },
                     Field {
                         label: "FreeMonoidCollectionProfile".to_string(),
-                        ty: DeclarationId(440),
+                        ty: DeclarationId(442),
                     },
                     Field {
                         label: "PartialFunctionProfile".to_string(),
-                        ty: DeclarationId(441),
+                        ty: DeclarationId(443),
                     },
                 ],
             },
@@ -1570,11 +1570,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SameAsReceiver".to_string(),
-                        ty: DeclarationId(442),
+                        ty: DeclarationId(444),
                     },
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(443),
+                        ty: DeclarationId(445),
                     },
                 ],
             },
@@ -1595,43 +1595,43 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReceiverSelf".to_string(),
-                        ty: DeclarationId(444),
+                        ty: DeclarationId(446),
                     },
                     Field {
                         label: "ReceiverElement".to_string(),
-                        ty: DeclarationId(445),
+                        ty: DeclarationId(447),
                     },
                     Field {
                         label: "ReceiverKey".to_string(),
-                        ty: DeclarationId(446),
+                        ty: DeclarationId(448),
                     },
                     Field {
                         label: "ReceiverValue".to_string(),
-                        ty: DeclarationId(447),
+                        ty: DeclarationId(449),
                     },
                     Field {
                         label: "NamedTemplate".to_string(),
-                        ty: DeclarationId(448),
+                        ty: DeclarationId(450),
                     },
                     Field {
                         label: "ContainerOf".to_string(),
-                        ty: DeclarationId(449),
+                        ty: DeclarationId(451),
                     },
                     Field {
                         label: "OptionalOf".to_string(),
-                        ty: DeclarationId(450),
+                        ty: DeclarationId(452),
                     },
                     Field {
                         label: "TupleOf".to_string(),
-                        ty: DeclarationId(451),
+                        ty: DeclarationId(453),
                     },
                     Field {
                         label: "CallableOf".to_string(),
-                        ty: DeclarationId(453),
+                        ty: DeclarationId(455),
                     },
                     Field {
                         label: "AlgebraTypeVariable".to_string(),
-                        ty: DeclarationId(454),
+                        ty: DeclarationId(456),
                     },
                 ],
             },
@@ -1652,15 +1652,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(455),
+                        ty: DeclarationId(457),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(456),
+                        ty: DeclarationId(458),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(457),
+                        ty: DeclarationId(459),
                     },
                 ],
             },
@@ -1681,19 +1681,19 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(458),
+                        ty: DeclarationId(460),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(459),
+                        ty: DeclarationId(461),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(460),
+                        ty: DeclarationId(462),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(461),
+                        ty: DeclarationId(463),
                     },
                 ],
             },
@@ -1714,11 +1714,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "param_types".to_string(),
-                        ty: DeclarationId(462),
+                        ty: DeclarationId(464),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -1726,15 +1726,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(463),
+                        ty: DeclarationId(465),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(464),
+                        ty: DeclarationId(466),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(465),
+                        ty: DeclarationId(467),
                     },
                 ],
             },
@@ -1752,21 +1752,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(59),
             name: Some("kernel_algebra_profile".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(53),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(466)),
+            meta_tag: Some(DeclarationId(468)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -1774,49 +1774,49 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "Int".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(435),
+                            constructor: DeclarationId(437),
                             payload: vec![],
                         },
                     ),
                     (
                         "Float".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(436),
+                            constructor: DeclarationId(438),
                             payload: vec![],
                         },
                     ),
                     (
                         "Bool".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(437),
+                            constructor: DeclarationId(439),
                             payload: vec![],
                         },
                     ),
                     (
                         "String".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(439),
+                            constructor: DeclarationId(441),
                             payload: vec![],
                         },
                     ),
                     (
                         "List".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(440),
+                            constructor: DeclarationId(442),
                             payload: vec![],
                         },
                     ),
                     (
                         "Set".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(438),
+                            constructor: DeclarationId(440),
                             payload: vec![],
                         },
                     ),
                     (
                         "Map".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(441),
+                            constructor: DeclarationId(443),
                             payload: vec![],
                         },
                     ),
@@ -1832,7 +1832,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ordered_ring_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(320),
+                output: DeclarationId(322),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 24213, 25355)),
             },
             type_params: vec![],
@@ -1850,7 +1850,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("approximate_field_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(321),
+                output: DeclarationId(323),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 25420, 26514)),
             },
             type_params: vec![],
@@ -1868,7 +1868,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("boolean_algebra_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(322),
+                output: DeclarationId(324),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 26577, 27338)),
             },
             type_params: vec![],
@@ -1886,7 +1886,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("boolean_algebra_collection_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(323),
+                output: DeclarationId(325),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 27703, 31048)),
             },
             type_params: vec![],
@@ -1904,7 +1904,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("free_monoid_scalar_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(324),
+                output: DeclarationId(326),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 31114, 34351)),
             },
             type_params: vec![],
@@ -1922,7 +1922,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("free_monoid_collection_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(325),
+                output: DeclarationId(327),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 34421, 39686)),
             },
             type_params: vec![],
@@ -1940,7 +1940,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("partial_function_templates".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(326),
+                output: DeclarationId(328),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 39750, 42574)),
             },
             type_params: vec![],
@@ -1958,7 +1958,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_templates_for_profile".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(327),
+                output: DeclarationId(329),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 42664, 43127)),
             },
             type_params: vec![],
@@ -1976,7 +1976,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_type_param_names".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(328),
+                output: DeclarationId(330),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/algebra.dag", 43469, 43750)),
             },
             type_params: vec![],
@@ -2051,7 +2051,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Phantom".to_string(),
-                    ty: DeclarationId(467),
+                    ty: DeclarationId(469),
                 }],
             },
             type_params: vec![DeclarationId(74), DeclarationId(75)],
@@ -2126,7 +2126,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(468),
+                        value: DeclarationId(470),
                     },
                 ],
             },
@@ -2152,7 +2152,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(469),
+                        value: DeclarationId(471),
                     },
                 ],
             },
@@ -2178,7 +2178,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(470),
+                        value: DeclarationId(472),
                     },
                 ],
             },
@@ -2204,7 +2204,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(471),
+                        value: DeclarationId(473),
                     },
                 ],
             },
@@ -2230,7 +2230,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(472),
+                        value: DeclarationId(474),
                     },
                 ],
             },
@@ -2256,7 +2256,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(473),
+                        value: DeclarationId(475),
                     },
                 ],
             },
@@ -2282,7 +2282,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(474),
+                        value: DeclarationId(476),
                     },
                 ],
             },
@@ -2308,7 +2308,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(475),
+                        value: DeclarationId(477),
                     },
                 ],
             },
@@ -2334,7 +2334,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(476),
+                        value: DeclarationId(478),
                     },
                 ],
             },
@@ -2360,7 +2360,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(477),
+                        value: DeclarationId(479),
                     },
                 ],
             },
@@ -2483,7 +2483,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(478),
+                    value: DeclarationId(480),
                 }],
             },
             type_params: vec![],
@@ -2525,7 +2525,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(479),
+                        value: DeclarationId(481),
                     },
                 ],
             },
@@ -2551,7 +2551,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(480),
+                        value: DeclarationId(482),
                     },
                 ],
             },
@@ -2592,7 +2592,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(481)),
+            refinement: Some(DeclarationId(483)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/integer.dag", 9519, 9558),
         });
@@ -2603,7 +2603,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(39),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(40),
-                    value: DeclarationId(482),
+                    value: DeclarationId(484),
                 }],
             },
             type_params: vec![],
@@ -2623,23 +2623,23 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToNearestEven".to_string(),
-                        ty: DeclarationId(483),
+                        ty: DeclarationId(485),
                     },
                     Field {
                         label: "ToZero".to_string(),
-                        ty: DeclarationId(484),
+                        ty: DeclarationId(486),
                     },
                     Field {
                         label: "ToPositiveInfinity".to_string(),
-                        ty: DeclarationId(485),
+                        ty: DeclarationId(487),
                     },
                     Field {
                         label: "ToNegativeInfinity".to_string(),
-                        ty: DeclarationId(486),
+                        ty: DeclarationId(488),
                     },
                     Field {
                         label: "ToAwayFromZero".to_string(),
-                        ty: DeclarationId(487),
+                        ty: DeclarationId(489),
                     },
                 ],
             },
@@ -2660,15 +2660,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(488),
+                        ty: DeclarationId(490),
                     },
                     Field {
                         label: "BinaryPrecision".to_string(),
-                        ty: DeclarationId(489),
+                        ty: DeclarationId(491),
                     },
                     Field {
                         label: "DecimalPrecision".to_string(),
-                        ty: DeclarationId(490),
+                        ty: DeclarationId(492),
                     },
                 ],
             },
@@ -2689,15 +2689,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoNaN".to_string(),
-                        ty: DeclarationId(491),
+                        ty: DeclarationId(493),
                     },
                     Field {
                         label: "QuietNaN".to_string(),
-                        ty: DeclarationId(492),
+                        ty: DeclarationId(494),
                     },
                     Field {
                         label: "QuietAndSignalingNaN".to_string(),
-                        ty: DeclarationId(493),
+                        ty: DeclarationId(495),
                     },
                 ],
             },
@@ -2718,11 +2718,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoInfinity".to_string(),
-                        ty: DeclarationId(494),
+                        ty: DeclarationId(496),
                     },
                     Field {
                         label: "SignedInfinity".to_string(),
-                        ty: DeclarationId(495),
+                        ty: DeclarationId(497),
                     },
                 ],
             },
@@ -2743,11 +2743,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSignedZero".to_string(),
-                        ty: DeclarationId(496),
+                        ty: DeclarationId(498),
                     },
                     Field {
                         label: "SignedZero".to_string(),
-                        ty: DeclarationId(497),
+                        ty: DeclarationId(499),
                     },
                 ],
             },
@@ -2768,15 +2768,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSubnormals".to_string(),
-                        ty: DeclarationId(498),
+                        ty: DeclarationId(500),
                     },
                     Field {
                         label: "GradualUnderflow".to_string(),
-                        ty: DeclarationId(499),
+                        ty: DeclarationId(501),
                     },
                     Field {
                         label: "FlushToZero".to_string(),
-                        ty: DeclarationId(500),
+                        ty: DeclarationId(502),
                     },
                 ],
             },
@@ -2826,7 +2826,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(501),
+                        ty: DeclarationId(503),
                     },
                     Field {
                         label: "rounding".to_string(),
@@ -2882,21 +2882,41 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1216, 1233),
+            span: SourceSpan::new("dsl/std/float.dag", 1248, 1265),
         });
         declarations.push(Declaration {
             id: DeclarationId(110),
-            name: Some("Float32".to_string()),
+            name: Some("Real".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(107),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(108),
+                    value: DeclarationId(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("dsl/std/float.dag", 1446, 1497),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(111),
+            name: Some("Real32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(73),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(74),
-                        value: DeclarationId(109),
+                        value: DeclarationId(110),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(502),
+                        value: DeclarationId(505),
                     },
                 ],
             },
@@ -2908,21 +2928,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1235, 1293),
+            span: SourceSpan::new("dsl/std/float.dag", 1719, 1768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(111),
-            name: Some("Float64".to_string()),
+            id: DeclarationId(112),
+            name: Some("Real64".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(73),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(74),
-                        value: DeclarationId(109),
+                        value: DeclarationId(110),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(75),
-                        value: DeclarationId(503),
+                        value: DeclarationId(506),
                     },
                 ],
             },
@@ -2934,11 +2954,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1294, 1352),
+            span: SourceSpan::new("dsl/std/float.dag", 1769, 1818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(112),
-            name: Some("Float".to_string()),
+            id: DeclarationId(113),
+            name: Some("Float32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(111),
                 arguments: vec![],
@@ -2951,17 +2971,14 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1371, 1391),
+            span: SourceSpan::new("dsl/std/float.dag", 1820, 1841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(113),
-            name: Some("Real".to_string()),
+            id: DeclarationId(114),
+            name: Some("Float64".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(107),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(108),
-                    value: DeclarationId(504),
-                }],
+                template: DeclarationId(112),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -2971,27 +2988,44 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1572, 1623),
+            span: SourceSpan::new("dsl/std/float.dag", 1842, 1863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(114),
+            id: DeclarationId(115),
+            name: Some("Float".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(114),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("dsl/std/float.dag", 1882, 1902),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(116),
             name: Some("kernel_type_set".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(618)),
+            meta_tag: Some(DeclarationId(620)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -3036,11 +3070,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3041, 3206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(115),
+            id: DeclarationId(117),
             name: Some("is_kernel_type".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3248, 3344)),
             },
             type_params: vec![],
@@ -3054,24 +3088,24 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3208, 3344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(116),
+            id: DeclarationId(118),
             name: Some("container_type_arity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(93),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(619)),
+            meta_tag: Some(DeclarationId(621)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -3096,11 +3130,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3506, 3587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(117),
+            id: DeclarationId(119),
             name: Some("is_container_type".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3632, 3734)),
             },
             type_params: vec![],
@@ -3114,11 +3148,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3589, 3734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(118),
+            id: DeclarationId(120),
             name: Some("container_expected_arity".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(505),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(507),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 3786, 3827)),
             },
             type_params: vec![],
@@ -3132,11 +3166,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3736, 3827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(119),
+            id: DeclarationId(121),
             name: Some("container_param_names_for".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(506),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(508),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4067, 4204)),
             },
             type_params: vec![],
@@ -3150,11 +3184,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4003, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(120),
+            id: DeclarationId(122),
             name: Some("container_param_name".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(507),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(509),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4272, 4512)),
             },
             type_params: vec![],
@@ -3168,24 +3202,24 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4206, 4512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(121),
+            id: DeclarationId(123),
             name: Some("ordered_element_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(620)),
+            meta_tag: Some(DeclarationId(622)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -3200,11 +3234,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4706, 4778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(122),
+            id: DeclarationId(124),
             name: Some("is_ordered_element_collection".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 4835, 4892)),
             },
             type_params: vec![],
@@ -3218,24 +3252,24 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4780, 4892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(123),
+            id: DeclarationId(125),
             name: Some("container_template_algebra_rows".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(621)),
+            meta_tag: Some(DeclarationId(623)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Map(
@@ -3296,11 +3330,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 5684, 6123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(124),
+            id: DeclarationId(126),
             name: Some("container_template_algebra".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
-                output: DeclarationId(508),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(510),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 6180, 6232)),
             },
             type_params: vec![],
@@ -3314,11 +3348,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6125, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(125),
+            id: DeclarationId(127),
             name: Some("canonical_container_names".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(509),
+                output: DeclarationId(511),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/types.dag", 6521, 6600)),
             },
             type_params: vec![],
@@ -3332,17 +3366,17 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6474, 6600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(126),
+            id: DeclarationId(128),
             name: Some("Bool".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "True".to_string(),
-                        ty: DeclarationId(510),
+                        ty: DeclarationId(512),
                     },
                     Field {
                         label: "False".to_string(),
-                        ty: DeclarationId(511),
+                        ty: DeclarationId(513),
                     },
                 ],
             },
@@ -3350,14 +3384,14 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(664)),
+            inhabits: Some(DeclarationId(666)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 7574, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(127),
+            id: DeclarationId(129),
             name: Some("Unit".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -3371,7 +3405,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7666, 7675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(128),
+            id: DeclarationId(130),
             name: Some("Json".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -3385,7 +3419,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7792, 7801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(129),
+            id: DeclarationId(131),
             name: Some("Bytes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -3399,7 +3433,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7802, 7812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(130),
+            id: DeclarationId(132),
             name: Some("Char".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -3416,16 +3450,16 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 8503, 8518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(131),
+            id: DeclarationId(133),
             name: Some("List".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(132),
+                    value: DeclarationId(134),
                 }],
             },
-            type_params: vec![DeclarationId(132)],
+            type_params: vec![DeclarationId(134)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -3436,7 +3470,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9282, 9322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(132),
+            id: DeclarationId(134),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -3450,16 +3484,16 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9282, 9322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(133),
+            id: DeclarationId(135),
             name: Some("Set".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(45),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(46),
-                    value: DeclarationId(134),
+                    value: DeclarationId(136),
                 }],
             },
-            type_params: vec![DeclarationId(134)],
+            type_params: vec![DeclarationId(136)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -3470,7 +3504,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9323, 9366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(134),
+            id: DeclarationId(136),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())),
             type_params: vec![],
@@ -3484,22 +3518,22 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9323, 9366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(135),
+            id: DeclarationId(137),
             name: Some("Map".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(50),
-                        value: DeclarationId(136),
+                        value: DeclarationId(138),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(51),
-                        value: DeclarationId(137),
+                        value: DeclarationId(139),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(136), DeclarationId(137)],
+            type_params: vec![DeclarationId(138), DeclarationId(139)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -3510,7 +3544,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(136),
+            id: DeclarationId(138),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("key".to_string())),
             type_params: vec![],
@@ -3524,7 +3558,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(137),
+            id: DeclarationId(139),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -3538,10 +3572,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 9367, 9417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(138),
+            id: DeclarationId(140),
             name: Some("CommitSha".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3555,10 +3589,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10763, 10789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(139),
+            id: DeclarationId(141),
             name: Some("Sha256".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3572,7 +3606,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10857, 10883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(140),
+            id: DeclarationId(142),
             name: Some("RetryCount".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -3581,12 +3615,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(622)),
+            refinement: Some(DeclarationId(624)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 10884, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(141),
+            id: DeclarationId(143),
             name: Some("HttpStatus".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -3595,15 +3629,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(623)),
+            refinement: Some(DeclarationId(625)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 10936, 10991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(142),
+            id: DeclarationId(144),
             name: Some("Email".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3617,7 +3651,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11065, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(143),
+            id: DeclarationId(145),
             name: Some("Port".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -3626,15 +3660,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(624)),
+            refinement: Some(DeclarationId(626)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11092, 11147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(144),
+            id: DeclarationId(146),
             name: Some("GistId".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3648,10 +3682,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11236, 11262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(145),
+            id: DeclarationId(147),
             name: Some("Secret".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3667,24 +3701,24 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11263, 11304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(146),
+            id: DeclarationId(148),
             name: Some("SecretValue".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(145))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(147))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(625)),
+            refinement: Some(DeclarationId(627)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11305, 11347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(147),
+            id: DeclarationId(149),
             name: Some("Url".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3698,10 +3732,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11408, 11434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(148),
+            id: DeclarationId(150),
             name: Some("SemVer".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3715,82 +3749,82 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11507, 11533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(149),
+            id: DeclarationId(151),
             name: Some("NonEmptyStr".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(626)),
+            refinement: Some(DeclarationId(628)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11534, 11579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(150),
+            id: DeclarationId(152),
             name: Some("LanguageId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(627)),
+            refinement: Some(DeclarationId(629)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11580, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(151),
+            id: DeclarationId(153),
             name: Some("SecretName".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(628)),
+            refinement: Some(DeclarationId(630)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 11626, 11671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(152),
+            id: DeclarationId(154),
             name: Some("PathSegment".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(629)),
+            refinement: Some(DeclarationId(631)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12306, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(153),
+            id: DeclarationId(155),
             name: Some("GlobSegment".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(630)),
+            refinement: Some(DeclarationId(632)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12366, 12425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(154),
+            id: DeclarationId(156),
             name: Some("FilePathParts".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segments".to_string(),
-                    ty: DeclarationId(512),
+                    ty: DeclarationId(514),
                 }],
             },
             type_params: vec![],
@@ -3804,12 +3838,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12426, 12478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(155),
+            id: DeclarationId(157),
             name: Some("GlobPattern".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segments".to_string(),
-                    ty: DeclarationId(513),
+                    ty: DeclarationId(515),
                 }],
             },
             type_params: vec![],
@@ -3823,27 +3857,27 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12479, 12529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(156),
+            id: DeclarationId(158),
             name: Some("FilePath".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(631)),
+            refinement: Some(DeclarationId(633)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 12530, 12573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(157),
+            id: DeclarationId(159),
             name: Some("SourceSpan".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "start".to_string(),
@@ -3866,10 +3900,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13191, 13251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(158),
+            id: DeclarationId(160),
             name: Some("Timestamp".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -3883,7 +3917,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13351, 13377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(159),
+            id: DeclarationId(161),
             name: Some("EpochMs".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -3892,12 +3926,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(632)),
+            refinement: Some(DeclarationId(634)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13378, 13422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(160),
+            id: DeclarationId(162),
             name: Some("Duration".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -3906,12 +3940,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(633)),
+            refinement: Some(DeclarationId(635)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13423, 13467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(161),
+            id: DeclarationId(163),
             name: Some("Milliseconds".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -3920,12 +3954,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(634)),
+            refinement: Some(DeclarationId(636)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13949, 13993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(162),
+            id: DeclarationId(164),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(93))),
             type_params: vec![],
@@ -3934,225 +3968,225 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(635)),
+            refinement: Some(DeclarationId(637)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 13994, 14038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(163),
+            id: DeclarationId(165),
             name: Some("IntentId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(636)),
+            refinement: Some(DeclarationId(638)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14562, 14617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(164),
+            id: DeclarationId(166),
             name: Some("IssueId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(637)),
+            refinement: Some(DeclarationId(639)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14618, 14672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(165),
+            id: DeclarationId(167),
             name: Some("RunKey".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(638)),
+            refinement: Some(DeclarationId(640)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14673, 14726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(166),
+            id: DeclarationId(168),
             name: Some("ArtifactId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(639)),
+            refinement: Some(DeclarationId(641)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14727, 14784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(167),
+            id: DeclarationId(169),
             name: Some("LeaseToken".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(640)),
+            refinement: Some(DeclarationId(642)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14785, 14842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(168),
+            id: DeclarationId(170),
             name: Some("WorkerId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(641)),
+            refinement: Some(DeclarationId(643)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14843, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(169),
+            id: DeclarationId(171),
             name: Some("CommentId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(642)),
+            refinement: Some(DeclarationId(644)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14899, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(170),
+            id: DeclarationId(172),
             name: Some("SignalKey".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(643)),
+            refinement: Some(DeclarationId(645)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 14956, 15012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(171),
+            id: DeclarationId(173),
             name: Some("ContentHash".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(644)),
+            refinement: Some(DeclarationId(646)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15013, 15071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(172),
+            id: DeclarationId(174),
             name: Some("WorkflowProducerId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(645)),
+            refinement: Some(DeclarationId(647)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15302, 15373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(173),
+            id: DeclarationId(175),
             name: Some("WorkflowObserverId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(646)),
+            refinement: Some(DeclarationId(648)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15374, 15445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(174),
+            id: DeclarationId(176),
             name: Some("WorkflowProverId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(647)),
+            refinement: Some(DeclarationId(649)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15446, 15513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(175),
+            id: DeclarationId(177),
             name: Some("WorkflowRunId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(149))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(648)),
+            refinement: Some(DeclarationId(650)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15514, 15575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(176),
+            id: DeclarationId(178),
             name: Some("GitRef".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(649)),
+            refinement: Some(DeclarationId(651)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 15655, 15697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(177),
+            id: DeclarationId(179),
             name: Some("GcpProjectId".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(650)),
+            refinement: Some(DeclarationId(652)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 16082, 16124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(178),
+            id: DeclarationId(180),
             name: Some("ServiceAccountEmail".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -4166,21 +4200,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16249, 16282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(179),
+            id: DeclarationId(181),
             name: Some("Platform".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Linux".to_string(),
-                        ty: DeclarationId(514),
+                        ty: DeclarationId(516),
                     },
                     Field {
                         label: "Macos".to_string(),
-                        ty: DeclarationId(515),
+                        ty: DeclarationId(517),
                     },
                     Field {
                         label: "Windows".to_string(),
-                        ty: DeclarationId(516),
+                        ty: DeclarationId(518),
                     },
                 ],
             },
@@ -4195,25 +4229,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16668, 16711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(180),
+            id: DeclarationId(182),
             name: Some("TopologyNodeKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(517),
+                        ty: DeclarationId(519),
                     },
                     Field {
                         label: "Transport".to_string(),
-                        ty: DeclarationId(518),
+                        ty: DeclarationId(520),
                     },
                     Field {
                         label: "SubDag".to_string(),
-                        ty: DeclarationId(519),
+                        ty: DeclarationId(521),
                     },
                     Field {
                         label: "Env".to_string(),
-                        ty: DeclarationId(520),
+                        ty: DeclarationId(522),
                     },
                 ],
             },
@@ -4228,21 +4262,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16839, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(181),
+            id: DeclarationId(183),
             name: Some("DocSourceKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Template".to_string(),
-                        ty: DeclarationId(521),
+                        ty: DeclarationId(523),
                     },
                     Field {
                         label: "Generated".to_string(),
-                        ty: DeclarationId(522),
+                        ty: DeclarationId(524),
                     },
                     Field {
                         label: "Static".to_string(),
-                        ty: DeclarationId(523),
+                        ty: DeclarationId(525),
                     },
                 ],
             },
@@ -4257,29 +4291,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16895, 16948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(182),
+            id: DeclarationId(184),
             name: Some("FermiDepth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Xs".to_string(),
-                        ty: DeclarationId(524),
+                        ty: DeclarationId(526),
                     },
                     Field {
                         label: "S".to_string(),
-                        ty: DeclarationId(525),
+                        ty: DeclarationId(527),
                     },
                     Field {
                         label: "M".to_string(),
-                        ty: DeclarationId(526),
+                        ty: DeclarationId(528),
                     },
                     Field {
                         label: "L".to_string(),
-                        ty: DeclarationId(527),
+                        ty: DeclarationId(529),
                     },
                     Field {
                         label: "Xl".to_string(),
-                        ty: DeclarationId(528),
+                        ty: DeclarationId(530),
                     },
                 ],
             },
@@ -4294,29 +4328,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16950, 16987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(183),
+            id: DeclarationId(185),
             name: Some("CredentialFlow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Stored".to_string(),
-                        ty: DeclarationId(529),
+                        ty: DeclarationId(531),
                     },
                     Field {
                         label: "PlatformInjected".to_string(),
-                        ty: DeclarationId(530),
+                        ty: DeclarationId(532),
                     },
                     Field {
                         label: "WorkloadIdentity".to_string(),
-                        ty: DeclarationId(533),
+                        ty: DeclarationId(535),
                     },
                     Field {
                         label: "InteractiveAuth".to_string(),
-                        ty: DeclarationId(535),
+                        ty: DeclarationId(537),
                     },
                     Field {
                         label: "Chained".to_string(),
-                        ty: DeclarationId(537),
+                        ty: DeclarationId(539),
                     },
                 ],
             },
@@ -4331,53 +4365,53 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17235, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(184),
+            id: DeclarationId(186),
             name: Some("Arch".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "X86_64".to_string(),
-                        ty: DeclarationId(538),
+                        ty: DeclarationId(540),
                     },
                     Field {
                         label: "X86".to_string(),
-                        ty: DeclarationId(539),
+                        ty: DeclarationId(541),
                     },
                     Field {
                         label: "Aarch64".to_string(),
-                        ty: DeclarationId(540),
+                        ty: DeclarationId(542),
                     },
                     Field {
                         label: "Arm".to_string(),
-                        ty: DeclarationId(541),
+                        ty: DeclarationId(543),
                     },
                     Field {
                         label: "Armv7".to_string(),
-                        ty: DeclarationId(542),
+                        ty: DeclarationId(544),
                     },
                     Field {
                         label: "Mips".to_string(),
-                        ty: DeclarationId(543),
+                        ty: DeclarationId(545),
                     },
                     Field {
                         label: "Mipsel".to_string(),
-                        ty: DeclarationId(544),
+                        ty: DeclarationId(546),
                     },
                     Field {
                         label: "Mips64".to_string(),
-                        ty: DeclarationId(545),
+                        ty: DeclarationId(547),
                     },
                     Field {
                         label: "Mips64el".to_string(),
-                        ty: DeclarationId(546),
+                        ty: DeclarationId(548),
                     },
                     Field {
                         label: "Riscv64".to_string(),
-                        ty: DeclarationId(547),
+                        ty: DeclarationId(549),
                     },
                     Field {
                         label: "Wasm32".to_string(),
-                        ty: DeclarationId(548),
+                        ty: DeclarationId(550),
                     },
                 ],
             },
@@ -4392,25 +4426,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17632, 17735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(185),
+            id: DeclarationId(187),
             name: Some("Vendor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnknownVendor".to_string(),
-                        ty: DeclarationId(549),
+                        ty: DeclarationId(551),
                     },
                     Field {
                         label: "Pc".to_string(),
-                        ty: DeclarationId(550),
+                        ty: DeclarationId(552),
                     },
                     Field {
                         label: "Apple".to_string(),
-                        ty: DeclarationId(551),
+                        ty: DeclarationId(553),
                     },
                     Field {
                         label: "W64".to_string(),
-                        ty: DeclarationId(552),
+                        ty: DeclarationId(554),
                     },
                 ],
             },
@@ -4425,37 +4459,37 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17736, 17782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(186),
+            id: DeclarationId(188),
             name: Some("Os".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Linux".to_string(),
-                        ty: DeclarationId(553),
+                        ty: DeclarationId(555),
                     },
                     Field {
                         label: "Macos".to_string(),
-                        ty: DeclarationId(554),
+                        ty: DeclarationId(556),
                     },
                     Field {
                         label: "Windows".to_string(),
-                        ty: DeclarationId(555),
+                        ty: DeclarationId(557),
                     },
                     Field {
                         label: "Freebsd".to_string(),
-                        ty: DeclarationId(556),
+                        ty: DeclarationId(558),
                     },
                     Field {
                         label: "Android".to_string(),
-                        ty: DeclarationId(557),
+                        ty: DeclarationId(559),
                     },
                     Field {
                         label: "Ios".to_string(),
-                        ty: DeclarationId(558),
+                        ty: DeclarationId(560),
                     },
                     Field {
                         label: "Wasi".to_string(),
-                        ty: DeclarationId(559),
+                        ty: DeclarationId(561),
                     },
                 ],
             },
@@ -4470,45 +4504,45 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17783, 17849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(187),
+            id: DeclarationId(189),
             name: Some("AbiEnv".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoneAbi".to_string(),
-                        ty: DeclarationId(560),
+                        ty: DeclarationId(562),
                     },
                     Field {
                         label: "Gnu".to_string(),
-                        ty: DeclarationId(561),
+                        ty: DeclarationId(563),
                     },
                     Field {
                         label: "GnuEabi".to_string(),
-                        ty: DeclarationId(562),
+                        ty: DeclarationId(564),
                     },
                     Field {
                         label: "GnuEabihf".to_string(),
-                        ty: DeclarationId(563),
+                        ty: DeclarationId(565),
                     },
                     Field {
                         label: "Musl".to_string(),
-                        ty: DeclarationId(564),
+                        ty: DeclarationId(566),
                     },
                     Field {
                         label: "Msvc".to_string(),
-                        ty: DeclarationId(565),
+                        ty: DeclarationId(567),
                     },
                     Field {
                         label: "AndroidAbi".to_string(),
-                        ty: DeclarationId(566),
+                        ty: DeclarationId(568),
                     },
                     Field {
                         label: "Eabi".to_string(),
-                        ty: DeclarationId(567),
+                        ty: DeclarationId(569),
                     },
                     Field {
                         label: "Eabihf".to_string(),
-                        ty: DeclarationId(568),
+                        ty: DeclarationId(570),
                     },
                 ],
             },
@@ -4523,29 +4557,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17850, 17942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(188),
+            id: DeclarationId(190),
             name: Some("ExecutionEnv".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Native".to_string(),
-                        ty: DeclarationId(569),
+                        ty: DeclarationId(571),
                     },
                     Field {
                         label: "Wsl".to_string(),
-                        ty: DeclarationId(570),
+                        ty: DeclarationId(572),
                     },
                     Field {
                         label: "Container".to_string(),
-                        ty: DeclarationId(571),
+                        ty: DeclarationId(573),
                     },
                     Field {
                         label: "Ci".to_string(),
-                        ty: DeclarationId(572),
+                        ty: DeclarationId(574),
                     },
                     Field {
                         label: "Emulator".to_string(),
-                        ty: DeclarationId(573),
+                        ty: DeclarationId(575),
                     },
                 ],
             },
@@ -4560,25 +4594,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17943, 18003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(189),
+            id: DeclarationId(191),
             name: Some("TargetTriple".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "arch".to_string(),
-                        ty: DeclarationId(184),
+                        ty: DeclarationId(186),
                     },
                     Field {
                         label: "vendor".to_string(),
-                        ty: DeclarationId(185),
+                        ty: DeclarationId(187),
                     },
                     Field {
                         label: "os".to_string(),
-                        ty: DeclarationId(186),
+                        ty: DeclarationId(188),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(574),
+                        ty: DeclarationId(576),
                     },
                 ],
             },
@@ -4593,17 +4627,17 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18005, 18080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(190),
+            id: DeclarationId(192),
             name: Some("RuntimePlatform".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "host".to_string(),
-                        ty: DeclarationId(189),
+                        ty: DeclarationId(191),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(188),
+                        ty: DeclarationId(190),
                     },
                 ],
             },
@@ -4618,29 +4652,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18082, 18147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(191),
+            id: DeclarationId(193),
             name: Some("EntryKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RegularFile".to_string(),
-                        ty: DeclarationId(575),
+                        ty: DeclarationId(577),
                     },
                     Field {
                         label: "Directory".to_string(),
-                        ty: DeclarationId(576),
+                        ty: DeclarationId(578),
                     },
                     Field {
                         label: "Symlink".to_string(),
-                        ty: DeclarationId(577),
+                        ty: DeclarationId(579),
                     },
                     Field {
                         label: "Missing".to_string(),
-                        ty: DeclarationId(578),
+                        ty: DeclarationId(580),
                     },
                     Field {
                         label: "Other".to_string(),
-                        ty: DeclarationId(579),
+                        ty: DeclarationId(581),
                     },
                 ],
             },
@@ -4655,21 +4689,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18456, 18534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(192),
+            id: DeclarationId(194),
             name: Some("SymlinkTarget".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TargetFile".to_string(),
-                        ty: DeclarationId(580),
+                        ty: DeclarationId(582),
                     },
                     Field {
                         label: "TargetDir".to_string(),
-                        ty: DeclarationId(581),
+                        ty: DeclarationId(583),
                     },
                     Field {
                         label: "Broken".to_string(),
-                        ty: DeclarationId(582),
+                        ty: DeclarationId(584),
                     },
                 ],
             },
@@ -4684,10 +4718,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18664, 18722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(193),
+            id: DeclarationId(195),
             name: Some("TextFilePath".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -4701,10 +4735,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 19883, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(194),
+            id: DeclarationId(196),
             name: Some("BinaryFilePath".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(156),
+                template: DeclarationId(158),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -4718,10 +4752,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 19994, 20024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(195),
+            id: DeclarationId(197),
             name: Some("MimeType".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(228),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -4735,37 +4769,37 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 20241, 20263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(196),
+            id: DeclarationId(198),
             name: Some("HttpMethod".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GET".to_string(),
-                        ty: DeclarationId(583),
+                        ty: DeclarationId(585),
                     },
                     Field {
                         label: "POST".to_string(),
-                        ty: DeclarationId(584),
+                        ty: DeclarationId(586),
                     },
                     Field {
                         label: "PUT".to_string(),
-                        ty: DeclarationId(585),
+                        ty: DeclarationId(587),
                     },
                     Field {
                         label: "PATCH".to_string(),
-                        ty: DeclarationId(586),
+                        ty: DeclarationId(588),
                     },
                     Field {
                         label: "DELETE".to_string(),
-                        ty: DeclarationId(587),
+                        ty: DeclarationId(589),
                     },
                     Field {
                         label: "HEAD".to_string(),
-                        ty: DeclarationId(588),
+                        ty: DeclarationId(590),
                     },
                     Field {
                         label: "OPTIONS".to_string(),
-                        ty: DeclarationId(589),
+                        ty: DeclarationId(591),
                     },
                 ],
             },
@@ -4780,25 +4814,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21007, 21075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(197),
+            id: DeclarationId(199),
             name: Some("AuthScheme".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bearer".to_string(),
-                        ty: DeclarationId(590),
+                        ty: DeclarationId(592),
                     },
                     Field {
                         label: "Header".to_string(),
-                        ty: DeclarationId(591),
+                        ty: DeclarationId(593),
                     },
                     Field {
                         label: "Basic".to_string(),
-                        ty: DeclarationId(592),
+                        ty: DeclarationId(594),
                     },
                     Field {
                         label: "ApiKey".to_string(),
-                        ty: DeclarationId(593),
+                        ty: DeclarationId(595),
                     },
                 ],
             },
@@ -4813,21 +4847,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21543, 21639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(198),
+            id: DeclarationId(200),
             name: Some("AccessToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "token".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                     Field {
                         label: "scheme".to_string(),
-                        ty: DeclarationId(197),
+                        ty: DeclarationId(199),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(594),
+                        ty: DeclarationId(596),
                     },
                 ],
             },
@@ -4842,33 +4876,33 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21761, 21894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(199),
+            id: DeclarationId(201),
             name: Some("Credential".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "token".to_string(),
-                        ty: DeclarationId(145),
+                        ty: DeclarationId(147),
                     },
                     Field {
                         label: "scheme".to_string(),
-                        ty: DeclarationId(197),
+                        ty: DeclarationId(199),
                     },
                     Field {
                         label: "header_name".to_string(),
-                        ty: DeclarationId(595),
+                        ty: DeclarationId(597),
                     },
                     Field {
                         label: "source_id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "required_scopes".to_string(),
-                        ty: DeclarationId(596),
+                        ty: DeclarationId(598),
                     },
                     Field {
                         label: "expires_in".to_string(),
-                        ty: DeclarationId(597),
+                        ty: DeclarationId(599),
                     },
                 ],
             },
@@ -4883,67 +4917,67 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21896, 22046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(200),
+            id: DeclarationId(202),
             name: Some("FilesystemHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(156))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(158))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(651)),
+            refinement: Some(DeclarationId(653)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22123, 22187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(201),
+            id: DeclarationId(203),
             name: Some("NetworkHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(127))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(129))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(652)),
+            refinement: Some(DeclarationId(654)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22188, 22245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(202),
+            id: DeclarationId(204),
             name: Some("ToolHandle".to_string()),
-            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(228))),
+            connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(230))),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(653)),
+            refinement: Some(DeclarationId(655)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 22246, 22302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(203),
+            id: DeclarationId(205),
             name: Some("TransportRequest".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "method".to_string(),
-                        ty: DeclarationId(196),
+                        ty: DeclarationId(198),
                     },
                     Field {
                         label: "url".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -4958,7 +4992,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22379, 22470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(204),
+            id: DeclarationId(206),
             name: Some("TransportResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -4968,11 +5002,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -4987,21 +5021,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22472, 22543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(205),
+            id: DeclarationId(207),
             name: Some("FileResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "success".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -5016,7 +5050,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22545, 22615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(206),
+            id: DeclarationId(208),
             name: Some("ShellResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -5026,11 +5060,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -5045,7 +5079,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22617, 22690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(207),
+            id: DeclarationId(209),
             name: Some("RestResponse".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -5055,11 +5089,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "headers".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(128),
+                        ty: DeclarationId(130),
                     },
                 ],
             },
@@ -5074,29 +5108,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22692, 22756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(208),
+            id: DeclarationId(210),
             name: Some("TestResult".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "ok".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "duration_ms".to_string(),
-                        ty: DeclarationId(161),
+                        ty: DeclarationId(163),
                     },
                 ],
             },
@@ -5111,7 +5145,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22833, 22940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(209),
+            id: DeclarationId(211),
             name: Some("Summary".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -5140,29 +5174,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22942, 22999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(210),
+            id: DeclarationId(212),
             name: Some("StageResult".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "success".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "stdout".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "stderr".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "skipped".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -5177,21 +5211,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23001, 23102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(211),
+            id: DeclarationId(213),
             name: Some("DocumentLine".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "text".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "is_comment".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "is_blank".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -5206,21 +5240,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23255, 23327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(212),
+            id: DeclarationId(214),
             name: Some("DocumentSection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "has_title".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "lines".to_string(),
-                        ty: DeclarationId(598),
+                        ty: DeclarationId(600),
                     },
                 ],
             },
@@ -5235,29 +5269,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23329, 23415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(213),
+            id: DeclarationId(215),
             name: Some("Document".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "header".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "has_header".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                     Field {
                         label: "comment_prefix".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "sections".to_string(),
-                        ty: DeclarationId(599),
+                        ty: DeclarationId(601),
                     },
                     Field {
                         label: "trailing_newline".to_string(),
-                        ty: DeclarationId(126),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -5272,17 +5306,17 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23417, 23554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(214),
+            id: DeclarationId(216),
             name: Some("TextFile".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "document".to_string(),
-                        ty: DeclarationId(213),
+                        ty: DeclarationId(215),
                     },
                 ],
             },
@@ -5297,17 +5331,17 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23556, 23609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(215),
+            id: DeclarationId(217),
             name: Some("RenderedTextFile".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -5322,21 +5356,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23611, 23669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(216),
+            id: DeclarationId(218),
             name: Some("ToolEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "command".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(600),
+                        ty: DeclarationId(602),
                     },
                 ],
             },
@@ -5351,12 +5385,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23746, 23820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(217),
+            id: DeclarationId(219),
             name: Some("ToolRegistry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tools".to_string(),
-                    ty: DeclarationId(601),
+                    ty: DeclarationId(603),
                 }],
             },
             type_params: vec![],
@@ -5370,21 +5404,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23822, 23868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(218),
+            id: DeclarationId(220),
             name: Some("DagTopology".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(602),
+                        ty: DeclarationId(604),
                     },
                     Field {
                         label: "edges".to_string(),
-                        ty: DeclarationId(603),
+                        ty: DeclarationId(605),
                     },
                     Field {
                         label: "subdag_boundaries".to_string(),
-                        ty: DeclarationId(604),
+                        ty: DeclarationId(606),
                     },
                 ],
             },
@@ -5399,25 +5433,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24127, 24237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(219),
+            id: DeclarationId(221),
             name: Some("TopologyNode".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "label".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(180),
+                        ty: DeclarationId(182),
                     },
                     Field {
                         label: "parent".to_string(),
-                        ty: DeclarationId(605),
+                        ty: DeclarationId(607),
                     },
                 ],
             },
@@ -5432,21 +5466,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24239, 24359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(220),
+            id: DeclarationId(222),
             name: Some("TopologyEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "from".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "to".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "port".to_string(),
-                        ty: DeclarationId(606),
+                        ty: DeclarationId(608),
                     },
                 ],
             },
@@ -5461,21 +5495,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24361, 24426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(221),
+            id: DeclarationId(223),
             name: Some("DagDiff".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "added".to_string(),
-                        ty: DeclarationId(607),
+                        ty: DeclarationId(609),
                     },
                     Field {
                         label: "removed".to_string(),
-                        ty: DeclarationId(608),
+                        ty: DeclarationId(610),
                     },
                     Field {
                         label: "changed".to_string(),
-                        ty: DeclarationId(609),
+                        ty: DeclarationId(611),
                     },
                 ],
             },
@@ -5490,29 +5524,29 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24428, 24514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(222),
+            id: DeclarationId(224),
             name: Some("CodegenTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "backend".to_string(),
-                        ty: DeclarationId(610),
+                        ty: DeclarationId(612),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(611),
+                        ty: DeclarationId(613),
                     },
                     Field {
                         label: "runtime_env".to_string(),
-                        ty: DeclarationId(612),
+                        ty: DeclarationId(614),
                     },
                 ],
             },
@@ -5527,25 +5561,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24583, 24717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(223),
+            id: DeclarationId(225),
             name: Some("CodegenBackend".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Rust".to_string(),
-                        ty: DeclarationId(613),
+                        ty: DeclarationId(615),
                     },
                     Field {
                         label: "Go".to_string(),
-                        ty: DeclarationId(614),
+                        ty: DeclarationId(616),
                     },
                     Field {
                         label: "C".to_string(),
-                        ty: DeclarationId(615),
+                        ty: DeclarationId(617),
                     },
                     Field {
                         label: "Mips".to_string(),
-                        ty: DeclarationId(616),
+                        ty: DeclarationId(618),
                     },
                 ],
             },
@@ -5560,21 +5594,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24719, 24761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(224),
+            id: DeclarationId(226),
             name: Some("PragmaDirective".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "key".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(617),
+                        ty: DeclarationId(619),
                     },
                 ],
             },
@@ -5589,17 +5623,17 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24763, 24834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(225),
+            id: DeclarationId(227),
             name: Some("DocSource".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(156),
+                        ty: DeclarationId(158),
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(181),
+                        ty: DeclarationId(183),
                     },
                 ],
             },
@@ -5614,10 +5648,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24975, 25032),
         });
         declarations.push(Declaration {
-            id: DeclarationId(226),
+            id: DeclarationId(228),
             name: Some("ReferenceModel".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
-            type_params: vec![DeclarationId(227)],
+            type_params: vec![DeclarationId(229)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -5628,7 +5662,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 26966, 26985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(227),
+            id: DeclarationId(229),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())),
             type_params: vec![],
@@ -5642,13 +5676,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 26966, 26985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(228),
+            id: DeclarationId(230),
             name: Some("String".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(130),
+                    value: DeclarationId(132),
                 }],
             },
             type_params: vec![],
@@ -5662,25 +5696,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/string_type.dag", 520, 550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(229),
+            id: DeclarationId(231),
             name: Some("CharClass".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Whitespace".to_string(),
-                        ty: DeclarationId(654),
+                        ty: DeclarationId(656),
                     },
                     Field {
                         label: "Digit".to_string(),
-                        ty: DeclarationId(655),
+                        ty: DeclarationId(657),
                     },
                     Field {
                         label: "IdentStart".to_string(),
-                        ty: DeclarationId(656),
+                        ty: DeclarationId(658),
                     },
                     Field {
                         label: "IdentContinue".to_string(),
-                        ty: DeclarationId(657),
+                        ty: DeclarationId(659),
                     },
                 ],
             },
@@ -5695,11 +5729,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3662, 3726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(230),
+            id: DeclarationId(232),
             name: Some("char_in_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130), DeclarationId(229)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(132), DeclarationId(231)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 3780, 4378)),
             },
             type_params: vec![],
@@ -5713,21 +5747,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3728, 4378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(231),
+            id: DeclarationId(233),
             name: Some("DisplayWidth".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(658),
+                        ty: DeclarationId(660),
                     },
                     Field {
                         label: "Narrow".to_string(),
-                        ty: DeclarationId(659),
+                        ty: DeclarationId(661),
                     },
                     Field {
                         label: "Wide".to_string(),
-                        ty: DeclarationId(660),
+                        ty: DeclarationId(662),
                     },
                 ],
             },
@@ -5742,10 +5776,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4742, 4787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(232),
+            id: DeclarationId(234),
             name: Some("display_width_columns".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(231)],
+                inputs: vec![DeclarationId(233)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 4838, 4914)),
             },
@@ -5760,13 +5794,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4789, 4914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(233),
+            id: DeclarationId(235),
             name: Some("UnicodeBlock".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(228),
+                        ty: DeclarationId(230),
                     },
                     Field {
                         label: "start".to_string(),
@@ -5778,7 +5812,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "default_width".to_string(),
-                        ty: DeclarationId(231),
+                        ty: DeclarationId(233),
                     },
                 ],
             },
@@ -5793,18 +5827,18 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 5149, 5249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(234),
+            id: DeclarationId(236),
             name: Some("zero_width_blocks".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(661)),
+            meta_tag: Some(DeclarationId(663)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -5826,7 +5860,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -5849,7 +5883,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -5872,7 +5906,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -5895,7 +5929,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -5916,7 +5950,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -5939,7 +5973,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(658),
+                            constructor: DeclarationId(660),
                             payload: vec![],
                         },
                     ),
@@ -5950,18 +5984,18 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 5311, 6060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(235),
+            id: DeclarationId(237),
             name: Some("zero_width_codepoints".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(662)),
+            meta_tag: Some(DeclarationId(664)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -5975,18 +6009,18 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6127, 6339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(236),
+            id: DeclarationId(238),
             name: Some("wide_blocks".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(663)),
+            meta_tag: Some(DeclarationId(665)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -6006,7 +6040,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6029,7 +6063,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6052,7 +6086,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6073,7 +6107,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6096,7 +6130,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6119,7 +6153,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6140,7 +6174,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6163,7 +6197,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6186,7 +6220,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6207,7 +6241,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6228,7 +6262,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6249,7 +6283,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6270,7 +6304,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6293,7 +6327,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6316,7 +6350,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6337,7 +6371,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "default_width".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(660),
+                            constructor: DeclarationId(662),
                             payload: vec![],
                         },
                     ),
@@ -6348,10 +6382,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6386, 8175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(237),
+            id: DeclarationId(239),
             name: Some("code_point".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
+                inputs: vec![DeclarationId(132)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8355, 8366)),
             },
@@ -6366,11 +6400,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8325, 8366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(238),
+            id: DeclarationId(240),
             name: Some("in_block".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(233)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(93), DeclarationId(235)],
+                output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8418, 8470)),
             },
             type_params: vec![],
@@ -6384,11 +6418,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8368, 8470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(239),
+            id: DeclarationId(241),
             name: Some("char_display_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
-                output: DeclarationId(231),
+                inputs: vec![DeclarationId(132)],
+                output: DeclarationId(233),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8519, 8822)),
             },
             type_params: vec![],
@@ -6402,10 +6436,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8472, 8822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(240),
+            id: DeclarationId(242),
             name: Some("char_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(130)],
+                inputs: vec![DeclarationId(132)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8854, 8910)),
             },
@@ -6420,10 +6454,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8824, 8910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(241),
+            id: DeclarationId(243),
             name: Some("string_display_width".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228)],
+                inputs: vec![DeclarationId(230)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("dsl/std/unicode.dag", 8954, 9092)),
             },
@@ -6438,11 +6472,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 8912, 9092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(242),
+            id: DeclarationId(244),
             name: Some("repeat_string_loop".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/std/render_repeat_string_bootstrap.dag",
                     598,
@@ -6460,11 +6494,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/render_repeat_string_bootstrap.dag", 526, 717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(243),
+            id: DeclarationId(245),
             name: Some("repeat_string".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(228), DeclarationId(93)],
-                output: DeclarationId(228),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/std/render_repeat_string_bootstrap.dag",
                     765,
@@ -6482,12 +6516,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/render_repeat_string_bootstrap.dag", 719, 818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(244),
+            id: DeclarationId(246),
             name: Some("MethodDeclaration".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -6501,15 +6535,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 4779, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(245),
+            id: DeclarationId(247),
             name: Some("add_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6523,15 +6557,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5269, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(246),
+            id: DeclarationId(248),
             name: Some("all_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6545,15 +6579,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5322, 5374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(247),
+            id: DeclarationId(249),
             name: Some("any_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6567,15 +6601,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5375, 5427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(248),
+            id: DeclarationId(250),
             name: Some("append_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6589,15 +6623,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5428, 5486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(249),
+            id: DeclarationId(251),
             name: Some("bottom_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6611,15 +6645,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5487, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(250),
+            id: DeclarationId(252),
             name: Some("chars_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6633,15 +6667,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5546, 5602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(251),
+            id: DeclarationId(253),
             name: Some("clamp_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6655,15 +6689,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5603, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(252),
+            id: DeclarationId(254),
             name: Some("compare_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6677,15 +6711,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5660, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(253),
+            id: DeclarationId(255),
             name: Some("complement_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6699,15 +6733,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5721, 5787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(254),
+            id: DeclarationId(256),
             name: Some("concat_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6721,15 +6755,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5788, 5846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(255),
+            id: DeclarationId(257),
             name: Some("contains_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6743,15 +6777,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5847, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(256),
+            id: DeclarationId(258),
             name: Some("count_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6765,15 +6799,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5910, 5966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(257),
+            id: DeclarationId(259),
             name: Some("diff_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6787,15 +6821,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 5967, 6021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(258),
+            id: DeclarationId(260),
             name: Some("empty_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6809,15 +6843,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6022, 6078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(259),
+            id: DeclarationId(261),
             name: Some("ends_with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6831,15 +6865,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6079, 6143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(260),
+            id: DeclarationId(262),
             name: Some("enumerate_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6853,15 +6887,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6144, 6208),
         });
         declarations.push(Declaration {
-            id: DeclarationId(261),
+            id: DeclarationId(263),
             name: Some("filter_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6875,15 +6909,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6209, 6267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(262),
+            id: DeclarationId(264),
             name: Some("first_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6897,15 +6931,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6268, 6324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(263),
+            id: DeclarationId(265),
             name: Some("flat_map_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6919,15 +6953,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6325, 6387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(264),
+            id: DeclarationId(266),
             name: Some("fold_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6941,15 +6975,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6388, 6442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(265),
+            id: DeclarationId(267),
             name: Some("get_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6963,15 +6997,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6443, 6495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(266),
+            id: DeclarationId(268),
             name: Some("has_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -6985,15 +7019,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6496, 6548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(267),
+            id: DeclarationId(269),
             name: Some("intersect_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7007,15 +7041,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6549, 6613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(268),
+            id: DeclarationId(270),
             name: Some("is_empty_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7029,15 +7063,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6614, 6676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(269),
+            id: DeclarationId(271),
             name: Some("join_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7051,15 +7085,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6677, 6731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(270),
+            id: DeclarationId(272),
             name: Some("keys_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7073,15 +7107,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6732, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(271),
+            id: DeclarationId(273),
             name: Some("last_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7095,15 +7129,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6787, 6841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(272),
+            id: DeclarationId(274),
             name: Some("length_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7117,15 +7151,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6842, 6900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(273),
+            id: DeclarationId(275),
             name: Some("list_push_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7139,15 +7173,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6901, 6965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(274),
+            id: DeclarationId(276),
             name: Some("lookup_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7161,15 +7195,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 6966, 7024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(275),
+            id: DeclarationId(277),
             name: Some("map_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7183,15 +7217,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7025, 7077),
         });
         declarations.push(Declaration {
-            id: DeclarationId(276),
+            id: DeclarationId(278),
             name: Some("map_contains_key_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7205,15 +7239,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7078, 7156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(277),
+            id: DeclarationId(279),
             name: Some("map_get_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7227,15 +7261,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7157, 7217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(278),
+            id: DeclarationId(280),
             name: Some("map_has_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7249,15 +7283,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7218, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(279),
+            id: DeclarationId(281),
             name: Some("map_insert_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7271,15 +7305,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7279, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(280),
+            id: DeclarationId(282),
             name: Some("map_keys_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7293,15 +7327,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7346, 7408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(281),
+            id: DeclarationId(283),
             name: Some("map_merge_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7315,15 +7349,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7409, 7473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(282),
+            id: DeclarationId(284),
             name: Some("map_values_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7337,15 +7371,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7474, 7540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(283),
+            id: DeclarationId(285),
             name: Some("meet_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7359,15 +7393,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7541, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(284),
+            id: DeclarationId(286),
             name: Some("member_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7381,15 +7415,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7596, 7654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(285),
+            id: DeclarationId(287),
             name: Some("mul_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7403,15 +7437,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7655, 7707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(286),
+            id: DeclarationId(288),
             name: Some("negate_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7425,15 +7459,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7708, 7766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(287),
+            id: DeclarationId(289),
             name: Some("one_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7447,15 +7481,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7767, 7819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(288),
+            id: DeclarationId(290),
             name: Some("reciprocal_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7469,15 +7503,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7820, 7886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(289),
+            id: DeclarationId(291),
             name: Some("replace_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7491,15 +7525,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7887, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(290),
+            id: DeclarationId(292),
             name: Some("reverse_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7513,15 +7547,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 7948, 8008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(291),
+            id: DeclarationId(293),
             name: Some("skip_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7535,15 +7569,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8009, 8063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(292),
+            id: DeclarationId(294),
             name: Some("sort_by_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7557,15 +7591,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8064, 8124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(293),
+            id: DeclarationId(295),
             name: Some("split_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7579,15 +7613,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8125, 8181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(294),
+            id: DeclarationId(296),
             name: Some("starts_with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7601,15 +7635,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8182, 8250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(295),
+            id: DeclarationId(297),
             name: Some("string_contains_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7623,15 +7657,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8251, 8327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(296),
+            id: DeclarationId(298),
             name: Some("substring_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7645,15 +7679,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8328, 8392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(297),
+            id: DeclarationId(299),
             name: Some("take_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7667,15 +7701,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8393, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(298),
+            id: DeclarationId(300),
             name: Some("to_int_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7689,15 +7723,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8448, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(299),
+            id: DeclarationId(301),
             name: Some("to_lower_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7711,15 +7745,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8507, 8569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(300),
+            id: DeclarationId(302),
             name: Some("to_string_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7733,15 +7767,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8570, 8634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(301),
+            id: DeclarationId(303),
             name: Some("to_upper_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7755,15 +7789,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8635, 8697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(302),
+            id: DeclarationId(304),
             name: Some("top_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7777,15 +7811,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8698, 8750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(303),
+            id: DeclarationId(305),
             name: Some("trim_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7799,15 +7833,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8751, 8805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(304),
+            id: DeclarationId(306),
             name: Some("union_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7821,15 +7855,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8806, 8862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(305),
+            id: DeclarationId(307),
             name: Some("values_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7843,15 +7877,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8863, 8921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(306),
+            id: DeclarationId(308),
             name: Some("with_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7865,15 +7899,15 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8922, 8976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(307),
+            id: DeclarationId(309),
             name: Some("zero_method".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(244),
+                template: DeclarationId(246),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(244)),
+            meta_tag: Some(DeclarationId(246)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -7887,7 +7921,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/methods.dag", 8977, 9031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(308),
+            id: DeclarationId(310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -7901,7 +7935,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/logic.dag", 304, 308),
         });
         declarations.push(Declaration {
-            id: DeclarationId(309),
+            id: DeclarationId(311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -7915,12 +7949,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/logic.dag", 311, 316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(310),
+            id: DeclarationId(312),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(4),
                 }],
             },
@@ -7935,12 +7969,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1023, 1032),
         });
         declarations.push(Declaration {
-            id: DeclarationId(311),
+            id: DeclarationId(313),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(4),
                 }],
             },
@@ -7955,12 +7989,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1136, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(312),
+            id: DeclarationId(314),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -7975,12 +8009,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1272, 1282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(313),
+            id: DeclarationId(315),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -7995,12 +8029,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1306, 1316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(314),
+            id: DeclarationId(316),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -8015,12 +8049,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1340, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(315),
+            id: DeclarationId(317),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(6),
                 }],
             },
@@ -8035,7 +8069,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/bit.dag", 1375, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(316),
+            id: DeclarationId(318),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -8054,7 +8088,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 620, 636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(317),
+            id: DeclarationId(319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -8073,7 +8107,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 639, 657),
         });
         declarations.push(Declaration {
-            id: DeclarationId(318),
+            id: DeclarationId(320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -8087,7 +8121,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 936, 948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(319),
+            id: DeclarationId(321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -8101,12 +8135,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/error_primitives.dag", 951, 959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(320),
+            id: DeclarationId(322),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8121,12 +8155,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 24186, 24212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(321),
+            id: DeclarationId(323),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8141,12 +8175,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 25393, 25419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(322),
+            id: DeclarationId(324),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8161,12 +8195,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 26550, 26576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(323),
+            id: DeclarationId(325),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8181,12 +8215,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 27676, 27702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(324),
+            id: DeclarationId(326),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8201,12 +8235,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 31087, 31113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(325),
+            id: DeclarationId(327),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8221,12 +8255,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 34394, 34420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(326),
+            id: DeclarationId(328),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8241,12 +8275,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 39723, 39749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(327),
+            id: DeclarationId(329),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(58),
                 }],
             },
@@ -8261,13 +8295,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 42637, 42663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(328),
+            id: DeclarationId(330),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -8281,7 +8315,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 43456, 43468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(329),
+            id: DeclarationId(331),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(16), DeclarationId(16)],
@@ -8299,7 +8333,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 4724, 4737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(330),
+            id: DeclarationId(332),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(18), DeclarationId(18)],
@@ -8317,7 +8351,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 4843, 4856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(331),
+            id: DeclarationId(333),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(20), DeclarationId(20)],
@@ -8335,7 +8369,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5060, 5073),
         });
         declarations.push(Declaration {
-            id: DeclarationId(332),
+            id: DeclarationId(334),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(22), DeclarationId(22)],
@@ -8353,7 +8387,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5182, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(333),
+            id: DeclarationId(335),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(24), DeclarationId(24)],
@@ -8371,7 +8405,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5333, 5346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(334),
+            id: DeclarationId(336),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(24)],
@@ -8389,7 +8423,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(335),
+            id: DeclarationId(337),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(26), DeclarationId(26)],
@@ -8407,7 +8441,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5451, 5464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(336),
+            id: DeclarationId(338),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(26)],
@@ -8425,7 +8459,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 5490, 5500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(337),
+            id: DeclarationId(339),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(32), DeclarationId(32)],
@@ -8443,7 +8477,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 10528, 10541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(338),
+            id: DeclarationId(340),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(32), DeclarationId(32)],
@@ -8461,7 +8495,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 10559, 10572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(339),
+            id: DeclarationId(341),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(34), DeclarationId(34)],
@@ -8479,7 +8513,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11014, 11027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(340),
+            id: DeclarationId(342),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(34), DeclarationId(34)],
@@ -8497,7 +8531,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11045, 11058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(341),
+            id: DeclarationId(343),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36), DeclarationId(36)],
@@ -8515,7 +8549,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11218, 11231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(342),
+            id: DeclarationId(344),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36)],
@@ -8533,7 +8567,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11252, 11262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(343),
+            id: DeclarationId(345),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(36), DeclarationId(36)],
@@ -8551,7 +8585,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 11270, 11283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(344),
+            id: DeclarationId(346),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -8569,7 +8603,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12084, 12097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(345),
+            id: DeclarationId(347),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -8587,7 +8621,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12105, 12118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(346),
+            id: DeclarationId(348),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38)],
@@ -8605,7 +8639,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12139, 12149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(347),
+            id: DeclarationId(349),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -8623,7 +8657,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12157, 12170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(348),
+            id: DeclarationId(350),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -8649,11 +8683,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12190, 12209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(349),
+            id: DeclarationId(351),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(348),
+                output: DeclarationId(350),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -8667,7 +8701,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12178, 12209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(350),
+            id: DeclarationId(352),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
@@ -8685,11 +8719,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12230, 12250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(351),
+            id: DeclarationId(353),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -8703,11 +8737,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12257, 12273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(352),
+            id: DeclarationId(354),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -8721,11 +8755,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12280, 12296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(353),
+            id: DeclarationId(355),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -8739,11 +8773,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12303, 12319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(354),
+            id: DeclarationId(356),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -8757,11 +8791,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12326, 12342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(355),
+            id: DeclarationId(357),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -8775,11 +8809,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12349, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(356),
+            id: DeclarationId(358),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(38), DeclarationId(38)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -8793,7 +8827,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12372, 12388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(357),
+            id: DeclarationId(359),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -8811,7 +8845,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12551, 12564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(358),
+            id: DeclarationId(360),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40)],
@@ -8829,7 +8863,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12585, 12595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(359),
+            id: DeclarationId(361),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -8847,7 +8881,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12603, 12616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(360),
+            id: DeclarationId(362),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40)],
@@ -8865,7 +8899,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12640, 12650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(361),
+            id: DeclarationId(363),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(40), DeclarationId(40)],
@@ -8883,7 +8917,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 12662, 12682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(362),
+            id: DeclarationId(364),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(42), DeclarationId(42)],
@@ -8901,7 +8935,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13030, 13043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(363),
+            id: DeclarationId(365),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(42), DeclarationId(42)],
@@ -8919,7 +8953,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13052, 13065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(364),
+            id: DeclarationId(366),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(44), DeclarationId(44)],
@@ -8937,7 +8971,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13208, 13221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(365),
+            id: DeclarationId(367),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(44), DeclarationId(44)],
@@ -8955,7 +8989,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13230, 13243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(366),
+            id: DeclarationId(368),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46), DeclarationId(46)],
@@ -8973,7 +9007,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13497, 13510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(367),
+            id: DeclarationId(369),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46), DeclarationId(46)],
@@ -8991,7 +9025,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13519, 13532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(368),
+            id: DeclarationId(370),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(46)],
@@ -9009,7 +9043,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 13547, 13557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(369),
+            id: DeclarationId(371),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9029,7 +9063,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17529, 17542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(370),
+            id: DeclarationId(372),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9049,7 +9083,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17544, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(371),
+            id: DeclarationId(373),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9069,11 +9103,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17562, 17575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(372),
+            id: DeclarationId(374),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(369), DeclarationId(370)],
-                output: DeclarationId(371),
+                inputs: vec![DeclarationId(371), DeclarationId(372)],
+                output: DeclarationId(373),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9087,7 +9121,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17526, 17575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(373),
+            id: DeclarationId(375),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9107,7 +9141,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17585, 17598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(374),
+            id: DeclarationId(376),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9127,11 +9161,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17618, 17631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(375),
+            id: DeclarationId(377),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(374),
+                output: DeclarationId(376),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9145,7 +9179,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17609, 17631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(376),
+            id: DeclarationId(378),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9165,11 +9199,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17733, 17746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(377),
+            id: DeclarationId(379),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(376),
+                output: DeclarationId(378),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9183,7 +9217,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17717, 17746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(378),
+            id: DeclarationId(380),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -9201,11 +9235,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17757, 17768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(379),
+            id: DeclarationId(381),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9219,7 +9253,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17781, 17793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(380),
+            id: DeclarationId(382),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -9237,7 +9271,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17803, 17814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(381),
+            id: DeclarationId(383),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -9256,11 +9290,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(382),
+            id: DeclarationId(384),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(381),
+                output: DeclarationId(383),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9274,7 +9308,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17824, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(383),
+            id: DeclarationId(385),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -9293,11 +9327,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(384),
+            id: DeclarationId(386),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(383),
+                output: DeclarationId(385),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9311,7 +9345,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17843, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(385),
+            id: DeclarationId(387),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
@@ -9329,7 +9363,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17951, 17961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(386),
+            id: DeclarationId(388),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9349,11 +9383,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17966, 17979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(387),
+            id: DeclarationId(389),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(385)],
-                output: DeclarationId(386),
+                inputs: vec![DeclarationId(387)],
+                output: DeclarationId(388),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9367,11 +9401,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17948, 17979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(388),
+            id: DeclarationId(390),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9385,7 +9419,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17993, 18006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(389),
+            id: DeclarationId(391),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9405,11 +9439,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18011, 18024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(390),
+            id: DeclarationId(392),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(388)],
-                output: DeclarationId(389),
+                inputs: vec![DeclarationId(390)],
+                output: DeclarationId(391),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9423,7 +9457,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17990, 18024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(391),
+            id: DeclarationId(393),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48), DeclarationId(48)],
@@ -9441,10 +9475,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18039, 18052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(392),
+            id: DeclarationId(394),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(48), DeclarationId(391)],
+                inputs: vec![DeclarationId(48), DeclarationId(393)],
                 output: DeclarationId(48),
                 body: ArrowBody::NoBody,
             },
@@ -9459,7 +9493,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18033, 18058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(393),
+            id: DeclarationId(395),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9479,11 +9513,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18083, 18096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(394),
+            id: DeclarationId(396),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(393),
+                output: DeclarationId(395),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9497,7 +9531,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18074, 18096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(395),
+            id: DeclarationId(397),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9517,11 +9551,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18101, 18114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(396),
+            id: DeclarationId(398),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(394)],
-                output: DeclarationId(395),
+                inputs: vec![DeclarationId(396)],
+                output: DeclarationId(397),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9535,11 +9569,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18071, 18114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(397),
+            id: DeclarationId(399),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9553,11 +9587,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18125, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(398),
+            id: DeclarationId(400),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(397)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(399)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9571,11 +9605,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18122, 18147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(399),
+            id: DeclarationId(401),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9589,11 +9623,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18158, 18171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(400),
+            id: DeclarationId(402),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(399)],
-                output: DeclarationId(126),
+                inputs: vec![DeclarationId(401)],
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9607,7 +9641,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18155, 18180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(401),
+            id: DeclarationId(403),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::UnresolvedIdentifier(
                 "Tuple".to_string(),
@@ -9623,10 +9657,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18245, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(402),
+            id: DeclarationId(404),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(401),
+                template: DeclarationId(403),
                 arguments: vec![],
             },
             type_params: vec![],
@@ -9640,13 +9674,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18245, 18258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(403),
+            id: DeclarationId(405),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(48),
-                    value: DeclarationId(402),
+                    value: DeclarationId(404),
                 }],
             },
             type_params: vec![],
@@ -9660,11 +9694,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18234, 18259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(404),
+            id: DeclarationId(406),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(403),
+                output: DeclarationId(405),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9678,7 +9712,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18226, 18259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(405),
+            id: DeclarationId(407),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9698,11 +9732,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18279, 18292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(406),
+            id: DeclarationId(408),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(405),
+                output: DeclarationId(407),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9716,7 +9750,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18271, 18292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(407),
+            id: DeclarationId(409),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9736,11 +9770,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18312, 18325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(408),
+            id: DeclarationId(410),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(407),
+                output: DeclarationId(409),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9754,7 +9788,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18301, 18325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(409),
+            id: DeclarationId(411),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9774,11 +9808,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18345, 18358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(410),
+            id: DeclarationId(412),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(409),
+                output: DeclarationId(411),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9792,7 +9826,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18334, 18358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(411),
+            id: DeclarationId(413),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48), DeclarationId(48)],
@@ -9810,7 +9844,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18373, 18388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(412),
+            id: DeclarationId(414),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -9830,11 +9864,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18393, 18406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(413),
+            id: DeclarationId(415),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(411)],
-                output: DeclarationId(412),
+                inputs: vec![DeclarationId(413)],
+                output: DeclarationId(414),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9848,11 +9882,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18370, 18406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(414),
+            id: DeclarationId(416),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(48)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9866,7 +9900,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18419, 18432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(415),
+            id: DeclarationId(417),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -9885,11 +9919,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(416),
+            id: DeclarationId(418),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(415),
+                output: DeclarationId(417),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9903,7 +9937,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18988, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(417),
+            id: DeclarationId(419),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -9929,7 +9963,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19009, 19030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(418),
+            id: DeclarationId(420),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -9948,11 +9982,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(419),
+            id: DeclarationId(421),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(418),
+                output: DeclarationId(420),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -9966,7 +10000,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19038, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(420),
+            id: DeclarationId(422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -9992,11 +10026,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19072, 19093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(421),
+            id: DeclarationId(423),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50), DeclarationId(51)],
-                output: DeclarationId(420),
+                output: DeclarationId(422),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -10010,7 +10044,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19060, 19093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(422),
+            id: DeclarationId(424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -10036,7 +10070,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19106, 19127),
         });
         declarations.push(Declaration {
-            id: DeclarationId(423),
+            id: DeclarationId(425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(49),
@@ -10062,11 +10096,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19132, 19153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(424),
+            id: DeclarationId(426),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(422)],
-                output: DeclarationId(423),
+                inputs: vec![DeclarationId(424)],
+                output: DeclarationId(425),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -10080,7 +10114,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19103, 19153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(425),
+            id: DeclarationId(427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -10100,11 +10134,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19170, 19183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(426),
+            id: DeclarationId(428),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(425),
+                output: DeclarationId(427),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -10118,7 +10152,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19162, 19183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(427),
+            id: DeclarationId(429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(47),
@@ -10138,11 +10172,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19202, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(428),
+            id: DeclarationId(430),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(427),
+                output: DeclarationId(429),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -10156,11 +10190,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19194, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(429),
+            id: DeclarationId(431),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -10174,11 +10208,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19223, 19236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(430),
+            id: DeclarationId(432),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(50)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -10192,7 +10226,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19253, 19266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(431),
+            id: DeclarationId(433),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -10210,7 +10244,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19275, 19286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(432),
+            id: DeclarationId(434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10224,7 +10258,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19505, 19509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(433),
+            id: DeclarationId(435),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10238,7 +10272,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19512, 19517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(434),
+            id: DeclarationId(436),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10252,7 +10286,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19520, 19527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(435),
+            id: DeclarationId(437),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10266,7 +10300,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21636, 21654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(436),
+            id: DeclarationId(438),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10280,7 +10314,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21659, 21682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(437),
+            id: DeclarationId(439),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10294,7 +10328,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21687, 21708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(438),
+            id: DeclarationId(440),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10308,7 +10342,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21713, 21744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(439),
+            id: DeclarationId(441),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10322,7 +10356,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21749, 21772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(440),
+            id: DeclarationId(442),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10336,7 +10370,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21777, 21804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(441),
+            id: DeclarationId(443),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10350,7 +10384,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21809, 21831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(442),
+            id: DeclarationId(444),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10364,12 +10398,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21858, 21872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(443),
+            id: DeclarationId(445),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -10383,7 +10417,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21877, 21899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(444),
+            id: DeclarationId(446),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10397,7 +10431,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21930, 21942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(445),
+            id: DeclarationId(447),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10411,7 +10445,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21947, 21962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(446),
+            id: DeclarationId(448),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10425,7 +10459,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21967, 21978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(447),
+            id: DeclarationId(449),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10439,12 +10473,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 21983, 21996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(448),
+            id: DeclarationId(450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -10458,7 +10492,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22001, 22031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(449),
+            id: DeclarationId(451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -10483,7 +10517,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22036, 22105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(450),
+            id: DeclarationId(452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -10502,7 +10536,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22110, 22151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(451),
+            id: DeclarationId(453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -10527,12 +10561,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22156, 22223),
         });
         declarations.push(Declaration {
-            id: DeclarationId(452),
+            id: DeclarationId(454),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(55),
                 }],
             },
@@ -10547,13 +10581,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22249, 22274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(453),
+            id: DeclarationId(455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(452),
+                        ty: DeclarationId(454),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -10572,12 +10606,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22228, 22310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(454),
+            id: DeclarationId(456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "id".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -10591,7 +10625,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22315, 22349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(455),
+            id: DeclarationId(457),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10605,7 +10639,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22595, 22607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(456),
+            id: DeclarationId(458),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10619,7 +10653,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22665, 22681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(457),
+            id: DeclarationId(459),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10633,7 +10667,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 22728, 22742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(458),
+            id: DeclarationId(460),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10647,7 +10681,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23219, 23232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(459),
+            id: DeclarationId(461),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10661,7 +10695,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23248, 23263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(460),
+            id: DeclarationId(462),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10675,7 +10709,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23309, 23325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(461),
+            id: DeclarationId(463),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10689,12 +10723,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23372, 23385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(462),
+            id: DeclarationId(464),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(55),
                 }],
             },
@@ -10709,7 +10743,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23468, 23493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(463),
+            id: DeclarationId(465),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -10728,7 +10762,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(464),
+            id: DeclarationId(466),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -10747,7 +10781,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(465),
+            id: DeclarationId(467),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -10766,17 +10800,17 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(466),
+            id: DeclarationId(468),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(53),
                     },
                 ],
@@ -10792,7 +10826,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23872, 23899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(467),
+            id: DeclarationId(469),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -10806,7 +10840,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/machine_constraints.dag", 7335, 7342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(468),
+            id: DeclarationId(470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10826,7 +10860,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2277, 2295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(469),
+            id: DeclarationId(471),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10846,7 +10880,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2323, 2343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(470),
+            id: DeclarationId(472),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10866,7 +10900,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2371, 2391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(471),
+            id: DeclarationId(473),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10886,7 +10920,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2419, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(472),
+            id: DeclarationId(474),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10906,7 +10940,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2468, 2489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(473),
+            id: DeclarationId(475),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10926,7 +10960,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2583, 2601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(474),
+            id: DeclarationId(476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10946,7 +10980,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2631, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(475),
+            id: DeclarationId(477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10966,7 +11000,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2681, 2701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(476),
+            id: DeclarationId(478),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -10986,7 +11020,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2731, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(477),
+            id: DeclarationId(479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -11006,7 +11040,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 2782, 2803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(478),
+            id: DeclarationId(480),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(27),
@@ -11026,7 +11060,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 6254, 6274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(479),
+            id: DeclarationId(481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -11046,7 +11080,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 7962, 7988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(480),
+            id: DeclarationId(482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
@@ -11066,11 +11100,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 8024, 8050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(481),
+            id: DeclarationId(483),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(76)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(2))),
             },
             type_params: vec![],
@@ -11084,7 +11118,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/integer.dag", 9551, 9558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(482),
+            id: DeclarationId(484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(29),
@@ -11104,7 +11138,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/rational.dag", 1267, 1288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(483),
+            id: DeclarationId(485),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11118,7 +11152,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1052, 1065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(484),
+            id: DeclarationId(486),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11132,7 +11166,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1070, 1076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(485),
+            id: DeclarationId(487),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11146,7 +11180,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1081, 1099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(486),
+            id: DeclarationId(488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11160,7 +11194,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1104, 1122),
         });
         declarations.push(Declaration {
-            id: DeclarationId(487),
+            id: DeclarationId(489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11174,7 +11208,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1127, 1141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(488),
+            id: DeclarationId(490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11188,7 +11222,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1423, 1432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(489),
+            id: DeclarationId(491),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -11213,7 +11247,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1437, 1514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(490),
+            id: DeclarationId(492),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -11238,7 +11272,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1519, 1589),
         });
         declarations.push(Declaration {
-            id: DeclarationId(491),
+            id: DeclarationId(493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11252,7 +11286,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1829, 1834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(492),
+            id: DeclarationId(494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11266,7 +11300,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1837, 1845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(493),
+            id: DeclarationId(495),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11280,7 +11314,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1848, 1868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(494),
+            id: DeclarationId(496),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11294,7 +11328,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2118, 2128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(495),
+            id: DeclarationId(497),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11308,7 +11342,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2131, 2145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(496),
+            id: DeclarationId(498),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11322,7 +11356,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2400, 2412),
         });
         declarations.push(Declaration {
-            id: DeclarationId(497),
+            id: DeclarationId(499),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11336,7 +11370,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2415, 2425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(498),
+            id: DeclarationId(500),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11350,7 +11384,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2743, 2755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(499),
+            id: DeclarationId(501),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11364,7 +11398,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2758, 2774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(500),
+            id: DeclarationId(502),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11378,7 +11412,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2777, 2788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(501),
+            id: DeclarationId(503),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(39),
@@ -11398,13 +11432,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 3433, 3441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(502),
+            id: DeclarationId(504),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(70),
+                template: DeclarationId(29),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(71),
-                    value: DeclarationId(8),
+                    parameter: DeclarationId(30),
+                    value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -11415,16 +11449,16 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1272, 1292),
+            span: SourceSpan::new("dsl/std/float.dag", 1475, 1496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(503),
+            id: DeclarationId(505),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(70),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(71),
-                    value: DeclarationId(9),
+                    value: DeclarationId(8),
                 }],
             },
             type_params: vec![],
@@ -11435,16 +11469,16 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1331, 1351),
+            span: SourceSpan::new("dsl/std/float.dag", 1747, 1767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(504),
+            id: DeclarationId(506),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(29),
+                template: DeclarationId(70),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(30),
-                    value: DeclarationId(93),
+                    parameter: DeclarationId(71),
+                    value: DeclarationId(9),
                 }],
             },
             type_params: vec![],
@@ -11455,10 +11489,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/std/float.dag", 1601, 1622),
+            span: SourceSpan::new("dsl/std/float.dag", 1797, 1817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(505),
+            id: DeclarationId(507),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -11477,13 +11511,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(506),
+            id: DeclarationId(508),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -11497,11 +11531,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4054, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(507),
+            id: DeclarationId(509),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -11516,11 +11550,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(508),
+            id: DeclarationId(510),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -11535,13 +11569,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(509),
+            id: DeclarationId(511),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -11555,7 +11589,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6508, 6520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(510),
+            id: DeclarationId(512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11569,7 +11603,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7586, 7590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(511),
+            id: DeclarationId(513),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11583,13 +11617,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 7593, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(512),
+            id: DeclarationId(514),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(152),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(154),
                 }],
             },
             type_params: vec![],
@@ -11603,13 +11637,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12459, 12476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(513),
+            id: DeclarationId(515),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(153),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(155),
                 }],
             },
             type_params: vec![],
@@ -11623,7 +11657,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12510, 12527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(514),
+            id: DeclarationId(516),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11637,7 +11671,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16688, 16693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(515),
+            id: DeclarationId(517),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11651,7 +11685,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16696, 16701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(516),
+            id: DeclarationId(518),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11665,7 +11699,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16704, 16711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(517),
+            id: DeclarationId(519),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11679,7 +11713,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16863, 16867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(518),
+            id: DeclarationId(520),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11693,7 +11727,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16870, 16879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(519),
+            id: DeclarationId(521),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11707,7 +11741,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16882, 16888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(520),
+            id: DeclarationId(522),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11721,7 +11755,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16891, 16894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(521),
+            id: DeclarationId(523),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11735,7 +11769,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16919, 16927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(522),
+            id: DeclarationId(524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11749,7 +11783,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16930, 16939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(523),
+            id: DeclarationId(525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11763,7 +11797,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16942, 16948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(524),
+            id: DeclarationId(526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11777,7 +11811,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16968, 16970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(525),
+            id: DeclarationId(527),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11791,7 +11825,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16973, 16974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(526),
+            id: DeclarationId(528),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11805,7 +11839,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16977, 16978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(527),
+            id: DeclarationId(529),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11819,7 +11853,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16981, 16982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(528),
+            id: DeclarationId(530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -11833,12 +11867,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16985, 16987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(529),
+            id: DeclarationId(531),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "secret_name".to_string(),
-                    ty: DeclarationId(149),
+                    ty: DeclarationId(151),
                 }],
             },
             type_params: vec![],
@@ -11852,12 +11886,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17259, 17294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(530),
+            id: DeclarationId(532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "env_var".to_string(),
-                    ty: DeclarationId(149),
+                    ty: DeclarationId(151),
                 }],
             },
             type_params: vec![],
@@ -11871,11 +11905,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17299, 17340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(531),
+            id: DeclarationId(533),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(178),
+                    DeclarationId(180),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -11890,13 +11924,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17415, 17435),
         });
         declarations.push(Declaration {
-            id: DeclarationId(532),
+            id: DeclarationId(534),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -11910,21 +11944,21 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17450, 17462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(533),
+            id: DeclarationId(535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "audience".to_string(),
-                        ty: DeclarationId(149),
+                        ty: DeclarationId(151),
                     },
                     Field {
                         label: "service_account".to_string(),
-                        ty: DeclarationId(531),
+                        ty: DeclarationId(533),
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(532),
+                        ty: DeclarationId(534),
                     },
                 ],
             },
@@ -11939,13 +11973,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17345, 17468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(534),
+            id: DeclarationId(536),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -11959,12 +11993,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17499, 17511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(535),
+            id: DeclarationId(537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "scopes".to_string(),
-                    ty: DeclarationId(534),
+                    ty: DeclarationId(536),
                 }],
             },
             type_params: vec![],
@@ -11978,13 +12012,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17473, 17513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(536),
+            id: DeclarationId(538),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(183),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(185),
                 }],
             },
             type_params: vec![],
@@ -11998,12 +12032,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17535, 17555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(537),
+            id: DeclarationId(539),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(536),
+                    ty: DeclarationId(538),
                 }],
             },
             type_params: vec![],
@@ -12017,7 +12051,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17518, 17557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(538),
+            id: DeclarationId(540),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12031,7 +12065,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17644, 17650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(539),
+            id: DeclarationId(541),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12045,7 +12079,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17653, 17656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(540),
+            id: DeclarationId(542),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12059,7 +12093,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17659, 17666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(541),
+            id: DeclarationId(543),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12073,7 +12107,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17669, 17672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(542),
+            id: DeclarationId(544),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12087,7 +12121,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17675, 17680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(543),
+            id: DeclarationId(545),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12101,7 +12135,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17683, 17687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(544),
+            id: DeclarationId(546),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12115,7 +12149,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17690, 17696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(545),
+            id: DeclarationId(547),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12129,7 +12163,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17699, 17705),
         });
         declarations.push(Declaration {
-            id: DeclarationId(546),
+            id: DeclarationId(548),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12143,7 +12177,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17708, 17716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(547),
+            id: DeclarationId(549),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12157,7 +12191,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17719, 17726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(548),
+            id: DeclarationId(550),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12171,7 +12205,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17729, 17735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(549),
+            id: DeclarationId(551),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12185,7 +12219,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17750, 17763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(550),
+            id: DeclarationId(552),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12199,7 +12233,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17766, 17768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(551),
+            id: DeclarationId(553),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12213,7 +12247,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17771, 17776),
         });
         declarations.push(Declaration {
-            id: DeclarationId(552),
+            id: DeclarationId(554),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12227,7 +12261,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17779, 17782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(553),
+            id: DeclarationId(555),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12241,7 +12275,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17793, 17798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(554),
+            id: DeclarationId(556),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12255,7 +12289,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17801, 17806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(555),
+            id: DeclarationId(557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12269,7 +12303,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17809, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(556),
+            id: DeclarationId(558),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12283,7 +12317,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17819, 17826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(557),
+            id: DeclarationId(559),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12297,7 +12331,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17829, 17836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(558),
+            id: DeclarationId(560),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12311,7 +12345,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17839, 17842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(559),
+            id: DeclarationId(561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12325,7 +12359,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17845, 17849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(560),
+            id: DeclarationId(562),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12339,7 +12373,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17864, 17871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(561),
+            id: DeclarationId(563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12353,7 +12387,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17874, 17877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(562),
+            id: DeclarationId(564),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12367,7 +12401,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17880, 17887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(563),
+            id: DeclarationId(565),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12381,7 +12415,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17890, 17899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(564),
+            id: DeclarationId(566),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12395,7 +12429,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17902, 17906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(565),
+            id: DeclarationId(567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12409,7 +12443,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17909, 17913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(566),
+            id: DeclarationId(568),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12423,7 +12457,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17916, 17926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(567),
+            id: DeclarationId(569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12437,7 +12471,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17929, 17933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(568),
+            id: DeclarationId(570),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12451,7 +12485,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17936, 17942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(569),
+            id: DeclarationId(571),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12465,7 +12499,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17963, 17969),
         });
         declarations.push(Declaration {
-            id: DeclarationId(570),
+            id: DeclarationId(572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12479,7 +12513,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17972, 17975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(571),
+            id: DeclarationId(573),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12493,7 +12527,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17978, 17987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(572),
+            id: DeclarationId(574),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12507,7 +12541,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17990, 17992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(573),
+            id: DeclarationId(575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12521,11 +12555,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17995, 18003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(574),
+            id: DeclarationId(576),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(187),
+                    DeclarationId(189),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -12540,7 +12574,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18071, 18078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(575),
+            id: DeclarationId(577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12554,7 +12588,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18475, 18486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(576),
+            id: DeclarationId(578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12568,7 +12602,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18491, 18500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(577),
+            id: DeclarationId(579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12582,7 +12616,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18505, 18512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(578),
+            id: DeclarationId(580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12596,7 +12630,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18517, 18524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(579),
+            id: DeclarationId(581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12610,7 +12644,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18529, 18534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(580),
+            id: DeclarationId(582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12624,7 +12658,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18687, 18697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(581),
+            id: DeclarationId(583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12638,7 +12672,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18702, 18711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(582),
+            id: DeclarationId(584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12652,7 +12686,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 18716, 18722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(583),
+            id: DeclarationId(585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12666,7 +12700,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21025, 21028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(584),
+            id: DeclarationId(586),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12680,7 +12714,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21031, 21035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(585),
+            id: DeclarationId(587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12694,7 +12728,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21038, 21041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(586),
+            id: DeclarationId(588),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12708,7 +12742,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21044, 21049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(587),
+            id: DeclarationId(589),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12722,7 +12756,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21052, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(588),
+            id: DeclarationId(590),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12736,7 +12770,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21061, 21065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(589),
+            id: DeclarationId(591),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12750,7 +12784,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21068, 21075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(590),
+            id: DeclarationId(592),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12764,12 +12798,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21563, 21569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(591),
+            id: DeclarationId(593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "name".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -12783,12 +12817,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21574, 21597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(592),
+            id: DeclarationId(594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "username".to_string(),
-                    ty: DeclarationId(228),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -12802,7 +12836,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21602, 21628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(593),
+            id: DeclarationId(595),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -12816,11 +12850,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21633, 21639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(594),
+            id: DeclarationId(596),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(158),
+                    DeclarationId(160),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -12835,11 +12869,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21831, 21841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(595),
+            id: DeclarationId(597),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -12854,13 +12888,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21966, 21973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(596),
+            id: DeclarationId(598),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -12874,7 +12908,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22013, 22025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(597),
+            id: DeclarationId(599),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -12893,13 +12927,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22040, 22044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(598),
+            id: DeclarationId(600),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(211),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(213),
                 }],
             },
             type_params: vec![],
@@ -12913,13 +12947,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23395, 23413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(599),
+            id: DeclarationId(601),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(212),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(214),
                 }],
             },
             type_params: vec![],
@@ -12933,11 +12967,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23506, 23527),
         });
         declarations.push(Declaration {
-            id: DeclarationId(600),
+            id: DeclarationId(602),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -12952,13 +12986,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23811, 23818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(601),
+            id: DeclarationId(603),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(216),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(218),
                 }],
             },
             type_params: vec![],
@@ -12972,13 +13006,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23851, 23866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(602),
+            id: DeclarationId(604),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(219),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(221),
                 }],
             },
             type_params: vec![],
@@ -12992,13 +13026,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24155, 24173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(603),
+            id: DeclarationId(605),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(220),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(222),
                 }],
             },
             type_params: vec![],
@@ -13012,13 +13046,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24183, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(604),
+            id: DeclarationId(606),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -13032,11 +13066,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24223, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(605),
+            id: DeclarationId(607),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -13051,11 +13085,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24323, 24330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(606),
+            id: DeclarationId(608),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -13070,13 +13104,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24417, 24424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(607),
+            id: DeclarationId(609),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -13090,13 +13124,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24452, 24464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(608),
+            id: DeclarationId(610),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -13110,13 +13144,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24476, 24488),
         });
         declarations.push(Declaration {
-            id: DeclarationId(609),
+            id: DeclarationId(611),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(228),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -13130,11 +13164,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24500, 24512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(610),
+            id: DeclarationId(612),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(223),
+                    DeclarationId(225),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -13149,11 +13183,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24647, 24662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(611),
+            id: DeclarationId(613),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(189),
+                    DeclarationId(191),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -13168,11 +13202,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24673, 24686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(612),
+            id: DeclarationId(614),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(188),
+                    DeclarationId(190),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -13187,7 +13221,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24702, 24715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(613),
+            id: DeclarationId(615),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13201,7 +13235,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24741, 24745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(614),
+            id: DeclarationId(616),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13215,7 +13249,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24748, 24750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(615),
+            id: DeclarationId(617),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13229,7 +13263,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24753, 24754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(616),
+            id: DeclarationId(618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13243,11 +13277,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24757, 24761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(617),
+            id: DeclarationId(619),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(228),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -13262,18 +13296,18 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24825, 24832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(618),
+            id: DeclarationId(620),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
@@ -13288,17 +13322,17 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3063, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(619),
+            id: DeclarationId(621),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
+                        parameter: DeclarationId(139),
                         value: DeclarationId(93),
                     },
                 ],
@@ -13314,18 +13348,18 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3533, 3549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(620),
+            id: DeclarationId(622),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(126),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(128),
                     },
                 ],
             },
@@ -13340,18 +13374,18 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4740, 4757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(621),
+            id: DeclarationId(623),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(135),
+                template: DeclarationId(137),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(136),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(137),
-                        value: DeclarationId(228),
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
                     },
                 ],
             },
@@ -13366,11 +13400,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 5722, 5741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(622),
+            id: DeclarationId(624),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(8))),
             },
             type_params: vec![],
@@ -13384,11 +13418,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10914, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(623),
+            id: DeclarationId(625),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(14))),
             },
             type_params: vec![],
@@ -13402,11 +13436,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 10966, 10991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(624),
+            id: DeclarationId(626),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(20))),
             },
             type_params: vec![],
@@ -13420,7 +13454,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11122, 11147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(625),
+            id: DeclarationId(627),
             name: Some("<registered predicate not lowered: SecretValue>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13434,7 +13468,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11305, 11347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(626),
+            id: DeclarationId(628),
             name: Some("<registered predicate not lowered: NonEmptyStr>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13448,7 +13482,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11534, 11579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(627),
+            id: DeclarationId(629),
             name: Some("<registered predicate not lowered: LanguageId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13462,7 +13496,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11580, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(628),
+            id: DeclarationId(630),
             name: Some("<registered predicate not lowered: SecretName>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13476,7 +13510,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 11626, 11671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(629),
+            id: DeclarationId(631),
             name: Some("<registered predicate not lowered: PathSegment>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13490,7 +13524,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12306, 12365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(630),
+            id: DeclarationId(632),
             name: Some("<registered predicate not lowered: GlobSegment>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13504,7 +13538,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12366, 12425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(631),
+            id: DeclarationId(633),
             name: Some("<registered predicate not lowered: FilePath>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13518,11 +13552,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 12530, 12573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(632),
+            id: DeclarationId(634),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(23))),
             },
             type_params: vec![],
@@ -13536,11 +13570,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13409, 13422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(633),
+            id: DeclarationId(635),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(26))),
             },
             type_params: vec![],
@@ -13554,11 +13588,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13454, 13467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(634),
+            id: DeclarationId(636),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(29))),
             },
             type_params: vec![],
@@ -13572,11 +13606,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 13980, 13993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(635),
+            id: DeclarationId(637),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(126),
+                output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(32))),
             },
             type_params: vec![],
@@ -13590,7 +13624,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14025, 14038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(636),
+            id: DeclarationId(638),
             name: Some("<registered predicate not lowered: IntentId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13604,7 +13638,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14562, 14617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(637),
+            id: DeclarationId(639),
             name: Some("<registered predicate not lowered: IssueId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13618,7 +13652,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14618, 14672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(638),
+            id: DeclarationId(640),
             name: Some("<registered predicate not lowered: RunKey>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13632,7 +13666,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14673, 14726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(639),
+            id: DeclarationId(641),
             name: Some("<registered predicate not lowered: ArtifactId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13646,7 +13680,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14727, 14784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(640),
+            id: DeclarationId(642),
             name: Some("<registered predicate not lowered: LeaseToken>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13660,7 +13694,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14785, 14842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(641),
+            id: DeclarationId(643),
             name: Some("<registered predicate not lowered: WorkerId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13674,7 +13708,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14843, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(642),
+            id: DeclarationId(644),
             name: Some("<registered predicate not lowered: CommentId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13688,7 +13722,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14899, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(643),
+            id: DeclarationId(645),
             name: Some("<registered predicate not lowered: SignalKey>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13702,7 +13736,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 14956, 15012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(644),
+            id: DeclarationId(646),
             name: Some("<registered predicate not lowered: ContentHash>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13716,7 +13750,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15013, 15071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(645),
+            id: DeclarationId(647),
             name: Some("<registered predicate not lowered: WorkflowProducerId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13730,7 +13764,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15302, 15373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(646),
+            id: DeclarationId(648),
             name: Some("<registered predicate not lowered: WorkflowObserverId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13744,7 +13778,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15374, 15445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(647),
+            id: DeclarationId(649),
             name: Some("<registered predicate not lowered: WorkflowProverId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13758,7 +13792,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15446, 15513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(648),
+            id: DeclarationId(650),
             name: Some("<registered predicate not lowered: WorkflowRunId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13772,7 +13806,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15514, 15575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(649),
+            id: DeclarationId(651),
             name: Some("<registered predicate not lowered: GitRef>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13786,7 +13820,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 15655, 15697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(650),
+            id: DeclarationId(652),
             name: Some("<registered predicate not lowered: GcpProjectId>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13800,7 +13834,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16082, 16124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(651),
+            id: DeclarationId(653),
             name: Some("<registered predicate not lowered: FilesystemHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13814,7 +13848,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22123, 22187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(652),
+            id: DeclarationId(654),
             name: Some("<registered predicate not lowered: NetworkHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13828,7 +13862,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22188, 22245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(653),
+            id: DeclarationId(655),
             name: Some("<registered predicate not lowered: ToolHandle>".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13842,7 +13876,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 22246, 22302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(654),
+            id: DeclarationId(656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13856,7 +13890,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3679, 3689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(655),
+            id: DeclarationId(657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13870,7 +13904,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3692, 3697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(656),
+            id: DeclarationId(658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13884,7 +13918,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3700, 3710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(657),
+            id: DeclarationId(659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13898,7 +13932,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 3713, 3726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(658),
+            id: DeclarationId(660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13912,7 +13946,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4762, 4771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(659),
+            id: DeclarationId(661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13926,7 +13960,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4774, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(660),
+            id: DeclarationId(662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -13940,13 +13974,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 4783, 4787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(661),
+            id: DeclarationId(663),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
@@ -13960,12 +13994,12 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 5335, 5353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(662),
+            id: DeclarationId(664),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
+                    parameter: DeclarationId(134),
                     value: DeclarationId(93),
                 }],
             },
@@ -13980,13 +14014,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6155, 6164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(663),
+            id: DeclarationId(665),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(131),
+                template: DeclarationId(133),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(132),
-                    value: DeclarationId(233),
+                    parameter: DeclarationId(134),
+                    value: DeclarationId(235),
                 }],
             },
             type_params: vec![],
@@ -14000,13 +14034,13 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/unicode.dag", 6404, 6422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(664),
+            id: DeclarationId(666),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(45),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(46),
-                    value: DeclarationId(126),
+                    value: DeclarationId(128),
                 }],
             },
             type_params: vec![],
diff --git a/src/v3/compiler/tests/integration/common/substrate_receipts.rs b/src/v3/compiler/tests/integration/common/substrate_receipts.rs
index 12afb35d95b..3ed15495933 100644
--- a/src/v3/compiler/tests/integration/common/substrate_receipts.rs
+++ b/src/v3/compiler/tests/integration/common/substrate_receipts.rs
@@ -5,8 +5,8 @@
 use std::collections::HashMap;
 
 use v3_compiler::dag::{
-    Behavior, BindNode, Dag, DeclarationId, Field, PortState, TemplateArgument, TransformNode,
-    TransformTarget, TypeConnective,
+    AtomPayload, Behavior, BindNode, Dag, DeclarationId, Field, PortState, TemplateArgument,
+    TransformNode, TransformTarget, TypeConnective,
 };
 
 pub fn find_named(dag: &Dag, name: &str) -> DeclarationId {
@@ -103,86 +103,207 @@ pub fn bind_named<'a>(dag: &'a Dag, name: &str) -> &'a BindNode {
         .unwrap_or_else(|| panic!("Bind({name}) not found"))
 }
 
-/// Receipt: `Int64` is a width refinement `Compose<Int, MachineWidth<Word64>>` (R3 gate #19),
-/// not parallel `OrderedRing<Word64>` substrate. Abstract `Int` is
-/// `AbelianGroup<GroupCompletion<Nat>>` (Slice 3); fixed-width names compose it with
-/// the machine-width axis.
-pub fn assert_bootstrap_int64_compose_int_machine_width(dag: &Dag) {
-    let int64_id = find_named(dag, "Int64");
-    let compose_id = find_named(dag, "Compose");
-    let int_id = find_named(dag, "Int");
-    let machine_width_id = find_named(dag, "MachineWidth");
-    let word64_id = find_named(dag, "Word64");
+fn peel_zero_arg_alias(dag: &Dag, mut current: DeclarationId) -> DeclarationId {
+    for _ in 0..16 {
+        match &dag.declaration(current).connective {
+            TypeConnective::Instantiation {
+                template,
+                arguments,
+            } if arguments.is_empty() => current = *template,
+            _ => return current,
+        }
+    }
+    panic!("zero-arg alias chain exceeded receipt peel bound at {current:?}")
+}
+
+fn resolve_atom_alias(dag: &Dag, mut current: DeclarationId) -> DeclarationId {
+    for _ in 0..16 {
+        match &dag.declaration(current).connective {
+            TypeConnective::Atom(AtomPayload::ResolvedByName(next))
+            | TypeConnective::Atom(AtomPayload::ResolvedByStructure(next)) => current = *next,
+            _ => return current,
+        }
+    }
+    panic!("atom alias chain exceeded receipt peel bound at {current:?}")
+}
 
-    let connective = &dag.declaration(int64_id).connective;
+fn assert_single_arg_instantiation(
+    dag: &Dag,
+    alias_name: &str,
+    template_name: &str,
+    argument: DeclarationId,
+    message: &str,
+) {
+    let alias_id = resolve_atom_alias(dag, find_named(dag, alias_name));
+    let template_id = find_named(dag, template_name);
+    let connective = &dag.declaration(alias_id).connective;
     let TypeConnective::Instantiation {
         template,
         arguments,
     } = connective
     else {
-        panic!("Int64 must be a Compose instantiation, got {connective:?}");
+        panic!("{alias_name} must resolve to {template_name}<…>; got {connective:?}");
     };
-    assert_eq!(*template, compose_id);
+    assert_eq!(*template, template_id, "{message}");
     assert_eq!(
         arguments.len(),
-        2,
-        "Compose<Int, MachineWidth<…>> takes two arguments"
+        1,
+        "{template_name}<…> takes one carrier argument in this construction receipt"
     );
+    assert_eq!(arguments[0].value, argument, "{message}");
+}
 
-    let mut saw_int = false;
-    let mut saw_mw_word64 = false;
-    for arg in arguments {
-        if arg.value == int_id {
-            saw_int = true;
-            continue;
-        }
-        if let TypeConnective::Instantiation {
-            template: mw_template,
-            arguments: mw_args,
-        } = &dag.declaration(arg.value).connective
-        {
-            if *mw_template == machine_width_id
-                && mw_args.len() == 1
-                && mw_args[0].value == word64_id
-            {
-                saw_mw_word64 = true;
-            }
+/// Receipt: `Nat` is the natural-number carrier `CommutativeSemiring<Magnitude>`.
+pub fn assert_bootstrap_nat_is_commutative_semiring_magnitude(dag: &Dag) {
+    let magnitude_id = find_named(dag, "Magnitude");
+    assert_single_arg_instantiation(
+        dag,
+        "Nat",
+        "CommutativeSemiring",
+        magnitude_id,
+        "Nat must be CommutativeSemiring<Magnitude>",
+    );
+}
+
+/// Receipt: abstract `Int` is `AbelianGroup<GroupCompletion<Nat>>`.
+pub fn assert_bootstrap_int_is_group_completion_of_nat(dag: &Dag) {
+    let nat_id = find_named(dag, "Nat");
+    let group_completion_id = find_named(dag, "GroupCompletion");
+    let int_id = resolve_atom_alias(dag, find_named(dag, "Int"));
+    let TypeConnective::Instantiation {
+        template,
+        arguments,
+    } = &dag.declaration(int_id).connective
+    else {
+        panic!("Int must resolve to AbelianGroup<GroupCompletion<Nat>>");
+    };
+    assert_eq!(
+        *template,
+        find_named(dag, "AbelianGroup"),
+        "Int must be AbelianGroup<GroupCompletion<Nat>>"
+    );
+    assert_eq!(arguments.len(), 1, "AbelianGroup<T> takes one carrier");
+    match &dag.declaration(arguments[0].value).connective {
+        TypeConnective::Instantiation {
+            template,
+            arguments,
+        } => {
+            assert_eq!(
+                *template, group_completion_id,
+                "Int must complete Nat via GroupCompletion"
+            );
+            assert_eq!(arguments.len(), 1, "GroupCompletion<M> takes one carrier");
+            assert_eq!(
+                arguments[0].value, nat_id,
+                "Int must use Nat as the completed carrier"
+            );
         }
+        other => panic!("Int carrier must be GroupCompletion<Nat>; got {other:?}"),
     }
-    assert!(
-        saw_int,
-        "Int64 Compose must instantiate abstract Int (construction-chain carrier)"
+}
+
+/// Receipt: `Rational` is exact `Field<FieldOfFractions<Int>>`.
+pub fn assert_bootstrap_rational_is_field_of_fractions_int(dag: &Dag) {
+    let field_of_fractions_id = find_named(dag, "FieldOfFractions");
+    let rational_id = resolve_atom_alias(dag, find_named(dag, "Rational"));
+    let TypeConnective::Instantiation {
+        template,
+        arguments,
+    } = &dag.declaration(rational_id).connective
+    else {
+        panic!("Rational must resolve to Field<FieldOfFractions<Int>>");
+    };
+    assert_eq!(
+        *template,
+        find_named(dag, "Field"),
+        "Rational must be Field<FieldOfFractions<Int>>"
     );
-    assert!(
-        saw_mw_word64,
-        "Int64 Compose must include MachineWidth<Word64>"
+    assert_eq!(arguments.len(), 1, "Field<F> takes one carrier");
+    match &dag.declaration(arguments[0].value).connective {
+        TypeConnective::Instantiation {
+            template,
+            arguments,
+        } => {
+            assert_eq!(
+                *template, field_of_fractions_id,
+                "Rational must use FieldOfFractions as its carrier"
+            );
+            assert_eq!(arguments.len(), 1, "FieldOfFractions<R> takes one carrier");
+            assert_eq!(
+                arguments[0].value,
+                find_named(dag, "Int"),
+                "Rational must be over Int"
+            );
+        }
+        other => panic!("Rational carrier must be FieldOfFractions<Int>; got {other:?}"),
+    }
+}
+
+/// Receipt: `Real` is approximate `ApproximateField<FieldOfFractions<Int>>`.
+pub fn assert_bootstrap_real_is_approximate_field_of_fractions_int(dag: &Dag) {
+    let field_of_fractions_id = find_named(dag, "FieldOfFractions");
+    let real_id = resolve_atom_alias(dag, find_named(dag, "Real"));
+    let TypeConnective::Instantiation {
+        template,
+        arguments,
+    } = &dag.declaration(real_id).connective
+    else {
+        panic!("Real must resolve to ApproximateField<FieldOfFractions<Int>>");
+    };
+    assert_eq!(
+        resolve_atom_alias(dag, *template),
+        find_named(dag, "ApproximateField"),
+        "Real must be ApproximateField<FieldOfFractions<Int>>"
     );
+    assert_eq!(arguments.len(), 1, "ApproximateField<F> takes one carrier");
+    match &dag.declaration(arguments[0].value).connective {
+        TypeConnective::Instantiation {
+            template,
+            arguments,
+        } => {
+            assert_eq!(
+                *template, field_of_fractions_id,
+                "Real must approximate the same FieldOfFractions<Int> carrier"
+            );
+            assert_eq!(arguments.len(), 1, "FieldOfFractions<R> takes one carrier");
+            assert_eq!(arguments[0].value, find_named(dag, "Int"));
+        }
+        other => panic!("Real carrier must be FieldOfFractions<Int>; got {other:?}"),
+    }
 }
 
-/// Receipt: `Float64` refines opaque `Ieee754Float` with `MachineWidth<Word64>` (R3 gate #19).
-pub fn assert_bootstrap_float64_compose_ieee_machine_width(dag: &Dag) {
-    let float64_id = find_named(dag, "Float64");
+fn assert_compose_with_machine_width(
+    dag: &Dag,
+    alias_name: &str,
+    algebra_name: &str,
+    width_name: &str,
+) {
+    let alias_id = peel_zero_arg_alias(dag, find_named(dag, alias_name));
     let compose_id = find_named(dag, "Compose");
-    let ieee_id = find_named(dag, "Ieee754Float");
+    let algebra_id = find_named(dag, algebra_name);
     let machine_width_id = find_named(dag, "MachineWidth");
-    let word64_id = find_named(dag, "Word64");
+    let width_id = find_named(dag, width_name);
 
-    let connective = &dag.declaration(float64_id).connective;
+    let connective = &dag.declaration(alias_id).connective;
     let TypeConnective::Instantiation {
         template,
         arguments,
     } = connective
     else {
-        panic!("Float64 must be a Compose instantiation, got {connective:?}");
+        panic!("{alias_name} must resolve to a Compose instantiation, got {connective:?}");
     };
     assert_eq!(*template, compose_id);
-    assert_eq!(arguments.len(), 2);
+    assert_eq!(
+        arguments.len(),
+        2,
+        "Compose<{algebra_name}, MachineWidth<…>> takes two arguments"
+    );
 
-    let mut saw_ieee = false;
-    let mut saw_mw_word64 = false;
+    let mut saw_algebra = false;
+    let mut saw_machine_width = false;
     for arg in arguments {
-        if arg.value == ieee_id {
-            saw_ieee = true;
+        if arg.value == algebra_id {
+            saw_algebra = true;
             continue;
         }
         if let TypeConnective::Instantiation {
@@ -192,18 +313,46 @@ pub fn assert_bootstrap_float64_compose_ieee_machine_width(dag: &Dag) {
         {
             if *mw_template == machine_width_id
                 && mw_args.len() == 1
-                && mw_args[0].value == word64_id
+                && mw_args[0].value == width_id
             {
-                saw_mw_word64 = true;
+                saw_machine_width = true;
             }
         }
     }
     assert!(
-        saw_ieee,
-        "Float64 Compose must instantiate Ieee754Float axis"
+        saw_algebra,
+        "{alias_name} Compose must instantiate {algebra_name}"
     );
     assert!(
-        saw_mw_word64,
-        "Float64 Compose must include MachineWidth<Word64>"
+        saw_machine_width,
+        "{alias_name} Compose must include MachineWidth<{width_name}>"
+    );
+}
+
+/// Receipt: `Int64` is a width refinement `Compose<Int, MachineWidth<Word64>>` (R3 gate #19),
+/// not parallel `OrderedRing<Word64>` substrate. Abstract `Int` is
+/// `AbelianGroup<GroupCompletion<Nat>>` (Slice 3); fixed-width names compose it with
+/// the machine-width axis.
+pub fn assert_bootstrap_int64_compose_int_machine_width(dag: &Dag) {
+    assert_compose_with_machine_width(dag, "Int64", "Int", "Word64");
+}
+
+/// Receipt: `Int32` is a width refinement `Compose<Int, MachineWidth<Word32>>`.
+pub fn assert_bootstrap_int32_compose_int_machine_width(dag: &Dag) {
+    assert_compose_with_machine_width(dag, "Int32", "Int", "Word32");
+}
+
+/// Receipt: `Real64` refines abstract `Real` with `MachineWidth<Word64>` (R3 gate #67).
+pub fn assert_bootstrap_real64_compose_real_machine_width(dag: &Dag) {
+    assert_compose_with_machine_width(dag, "Real64", "Real", "Word64");
+}
+
+/// Receipt: compatibility `Float64` names the same fixed-width `Real64` construction.
+pub fn assert_bootstrap_float64_aliases_real64(dag: &Dag) {
+    let float64_id = peel_zero_arg_alias(dag, find_named(dag, "Float64"));
+    let real64_id = peel_zero_arg_alias(dag, find_named(dag, "Real64"));
+    assert_eq!(
+        float64_id, real64_id,
+        "Float64 should alias the canonical Real64 construction entry"
     );
 }
diff --git a/src/v3/compiler/tests/integration/m1_substrate_test.rs b/src/v3/compiler/tests/integration/m1_substrate_test.rs
index 4926a973cce..edb440b14a9 100644
--- a/src/v3/compiler/tests/integration/m1_substrate_test.rs
+++ b/src/v3/compiler/tests/integration/m1_substrate_test.rs
@@ -7,8 +7,13 @@ use v3_compiler::operators::{ArithmeticOp, ComparisonOp, LogicalOp, OperatorKind
 use v3_compiler::Diagnostic;
 
 use crate::common::substrate_receipts::{
-    assert_bootstrap_float64_compose_ieee_machine_width,
-    assert_bootstrap_int64_compose_int_machine_width, bind_named, bind_value_type_decl,
+    assert_bootstrap_float64_aliases_real64, assert_bootstrap_int32_compose_int_machine_width,
+    assert_bootstrap_int64_compose_int_machine_width,
+    assert_bootstrap_int_is_group_completion_of_nat,
+    assert_bootstrap_nat_is_commutative_semiring_magnitude,
+    assert_bootstrap_rational_is_field_of_fractions_int,
+    assert_bootstrap_real64_compose_real_machine_width,
+    assert_bootstrap_real_is_approximate_field_of_fractions_int, bind_named, bind_value_type_decl,
     callable_instantiation_arguments, field, find_named, transforms_in_source_file,
 };
 use crate::common::{cached_compile_any, cached_compile_to_dag};
@@ -47,8 +52,35 @@ fn bootstrap_int64_compose_int_machine_width_per_gate_19() {
 }
 
 #[test]
-fn bootstrap_float64_compose_ieee_machine_width_per_gate_19() {
-    assert_bootstrap_float64_compose_ieee_machine_width(&Dag::new());
+fn bootstrap_float64_aliases_real64_machine_width_construction() {
+    let dag = Dag::new();
+    assert_bootstrap_real64_compose_real_machine_width(&dag);
+    assert_bootstrap_float64_aliases_real64(&dag);
+}
+
+#[test]
+fn bootstrap_nat_is_commutative_semiring_magnitude() {
+    assert_bootstrap_nat_is_commutative_semiring_magnitude(&Dag::new());
+}
+
+#[test]
+fn bootstrap_int_is_group_completion_of_nat() {
+    assert_bootstrap_int_is_group_completion_of_nat(&Dag::new());
+}
+
+#[test]
+fn bootstrap_rational_is_field_of_fractions_int() {
+    assert_bootstrap_rational_is_field_of_fractions_int(&Dag::new());
+}
+
+#[test]
+fn bootstrap_real_is_approximate_field_of_fractions_int() {
+    assert_bootstrap_real_is_approximate_field_of_fractions_int(&Dag::new());
+}
+
+#[test]
+fn bootstrap_int32_compose_int_machine_width_per_gate_67() {
+    assert_bootstrap_int32_compose_int_machine_width(&Dag::new());
 }
 
 #[test]
diff --git a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
index 916cb32c38e..64280ea7fdf 100644
--- a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
+++ b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
@@ -3,7 +3,7 @@
 # path\titems\tdebug_bytes\tfnv1a64
 dsl/std/algebra.dag	37	165680	20af3b3ea1ec59df
 dsl/std/bit.dag	9	7787	09279906a3939377
-dsl/std/float.dag	11	7602	e4a96bf8945883a6
+dsl/std/float.dag	13	8702	2a65fc1d97769eae
 dsl/std/integer.dag	27	28654	03818aeb82802366
 dsl/std/logic.dag	5	5614	bb0fc43f94c4374f
 dsl/std/machine_constraints.dag	4	1682	ac8d7987ef5489c2